]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 19:53:59 +0000 (15:53 -0400)
1  2 
debian/changelog

Simple merge