Merge branch '2.5.x'
[catacomb] / .gitattributes
2013-08-11 Mark Wooding.gitattributes: New file; Python programs shouldn't...