projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30e122b 44e72fa)
Merge branch 'master' of git://git.ikiwiki.info
authorJonas Smedegaard <dr@jones.dk>
Wed, 22 Jul 2009 23:17:40 +0000 (01:17 +0200)
committerJonas Smedegaard <dr@jones.dk>
Wed, 22 Jul 2009 23:17:40 +0000 (01:17 +0200)
1  2 
IkiWiki/Plugin/po.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/po.pm
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.