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)
commitc99d26030e6ddd7a21932e98e40a8df7d896886d
tree26056e3e2a5c7c81ebe7baf243a0bb4ae765e76e
parentc9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2
parent1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772
Merge remote branch 'upstream/master' into prv/po

Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
IkiWiki.pm
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
doc/plugins/write.mdwn