]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 25 Jun 2010 12:38:37 +0000 (14:38 +0200)
committerintrigeri <intrigeri@boum.org>
Fri, 25 Jun 2010 12:38:37 +0000 (14:38 +0200)
commit9f401d6617a11efcedda1c956b2ccea061a7540f
treea5648589b38487427a58a7ebacfdc036a5dd102a
parent73f4a8835876c8cb07808367cd72d9ae972893e8
parent71950b2ae5ff6fd3b631c5504455cc07699b1c11
Merge remote branch 'upstream/master' into prv/po

Conflicts:
IkiWiki/Plugin/po.pm
IkiWiki.pm
IkiWiki/Plugin/po.pm