1 Commits (470112dd6e708a18eb4ec1daa10c4ea276620dbf)

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