1 Commits (2433522d2967b8a5e46f16de587a8fac5088a47c)

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