auto changelog merging
authorJoey Hess <joey@kitenet.net>
Fri, 25 Jun 2010 17:43:02 +0000 (13:43 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 25 Jun 2010 17:43:02 +0000 (13:43 -0400)
commit7399f56607d789b2152b9461397b93b8db88ccff
treeafb87b8e99956c29f0655e5a571478ecf812eb94
parent1f6ea9a626d9983ce84343e6a73604d58aa1df09
auto changelog merging
.gitattributes [new file with mode: 0644]