1 Commits (bf023e7dc0bae78ff0ab14dc9f10a87e2b56f676)

Author SHA1 Message Date
Armin Ronacher 0664a3f2dd Set merge strategy for CHANGES 9 years ago