more updates for trail merge
authorJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:38:20 +0000 (14:38 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:38:20 +0000 (14:38 -0400)
commit223c6d487ae05e50998f2cd50997befa5eafb321
tree689554c4dbf326f8afbd6cdee624441e5de66a8b
parentd134a2a6e93bbb26664b027a10d98ac996a63cfc
more updates for trail merge
debian/changelog
debian/copyright