Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:55:09 +0000 (00:55 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:55:09 +0000 (00:55 -0400)
commit998f47ed137959d0a0951368d8d0f891673c3ce5
tree10b26da9fe1513c3b8b4990e6caa7446352218a5
parent39d4bfde6b9c49f0a8b13699be701bda11eb851a
parente90d67d3c9a93862657563e17e24054087f205d1
Merge branch 'master' into templatemove
debian/changelog