1 Commits (97e2cd0a5a5f2b663d7a82edbaede2fe2cfb0679)

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