]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn

1  2 
IkiWiki.pm
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
doc/plugins/write.mdwn

diff --cc IkiWiki.pm
Simple merge
Simple merge
Simple merge
Simple merge