]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'intrigeri/po'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 23:48:32 +0000 (19:48 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 23:48:32 +0000 (19:48 -0400)
1  2 
IkiWiki/Plugin/inline.pm
IkiWiki/Plugin/po.pm

Simple merge
Simple merge