1 Commits (a690ae27a392cfa1474e062f7655250c416cd536)

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