Merge branch 'master' into commentreorg
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 16:42:38 +0000 (12:42 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 16:42:38 +0000 (12:42 -0400)
commit3adb47ec4f7374128d18a88cff54269104fc21fe
treedd1ac2c19cece5de41a9b557d76b14ce40687a23
parentd9d910f6765de6ba07508ab56a5a0f93edb4c8ad
parent25033d91145d0f102c6f6889f04e80e31b218684
Merge branch 'master' into commentreorg

Conflicts:
debian/changelog
debian/changelog