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)
1  2 
debian/changelog

Simple merge