1 Commits (a80eab70ba96d7d43c2ca5dc742597320aebe104)

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