]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
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)
commit041923a89ece8b1ed195cb7b528843c15770ea6f
treed85f7c488c05d8d6983ec1b65b2e427c59cc3acf
parente12627e0a4c73d4d47ac2f10750defe22b41580e
parent861dea7f1c720ff889ff11ef7b7e925a3c209c5d
Merge branch 'master' into autoconfig

Conflicts:

IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
IkiWiki/Plugin/git.pm
debian/changelog
doc/plugins/write.mdwn
doc/todo/color_plugin.mdwn