1 Commits (7005c2d5343a4f8025b70e0a1eea9c01f1d229b0)

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