1 Commits (7bd54e9bd61dc6d02237fd5d473fa92030a1ff33)

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