]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 03:22:42 +0000 (23:22 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 03:22:42 +0000 (23:22 -0400)
1  2 
debian/changelog

Simple merge