1 Commits (4cd0299aff607d0162b7b9a539a45b4df003e60b)

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