1 Commits (6478d7bb99ef7dcdda19ce3e58c00500ff72e60b)

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