]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'debian-testing'
authorJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 16:01:16 +0000 (12:01 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 16:01:16 +0000 (12:01 -0400)
Conflicts:
debian/changelog

1  2 
debian/changelog

Simple merge