1 Commits (60feecc26c60b8b6ba5349baf8d4cca5cbfed223)

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