Merge commit 'upstream/po' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:28:31 +0000 (12:28 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:28:31 +0000 (12:28 +0100)
commit1f54c13ec24977988a303f004f3fc08ee2e01abc
tree6e199ad04a48100286304ef53095e720ac72bca6
parentbd2dd8c60336ad7a03194d2a53f5409a620e484d
parent17bd930bc9f4192e084a223cf57af94680741853
Merge commit 'upstream/po' into prv/po

Conflicts:

IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn