]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 31 Jul 2008 23:35:37 +0000 (19:35 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 31 Jul 2008 23:35:37 +0000 (19:35 -0400)
Conflicts:

IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot


No differences found