Commit 06684c510ab3115093178cdcfb28c2fff41b324c
2012-02-14T13:25:35
gitattributes: custom merge driver for ChangeLog not needed anymore * .gitattributes: We don't maintain a version-controlled ChangeLog file anymore, so we have no need to specify a custom merge driver for it anymore. Update accordingly.