]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 29 Mar 2009 18:54:53 +0000 (14:54 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 29 Mar 2009 18:54:53 +0000 (14:54 -0400)
commit3d8f0b1a3f749006424fb719ea1841ef366b5090
tree4f28be138c57ec180f394076d322800020901302
parentb1551ed0e297e75492e578bf2445fcde99dad86a
parent82c3f6d7f4c8dd00589ba3c039856d6620ec2456
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/plugins/contrib/po.mdwn
doc/plugins/contrib/po.mdwn