Merge remote branch 'upstream/master' into prv/po

author intrigeri <intrigeri@boum.org>

Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)

committer intrigeri <intrigeri@boum.org>

Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
author intrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
committer intrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
diff --cc IkiWiki.pm
Simple merge
diff --cc IkiWiki/Plugin/po.pm
Simple merge
diff --cc doc/plugins/po.mdwn
Simple merge
diff --cc doc/plugins/write.mdwn
Simple merge
author	intrigeri <intrigeri@boum.org>
	Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
committer	intrigeri <intrigeri@boum.org>
	Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
		1	2
IkiWiki.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/po.pm	patch \|	diff1 \|	diff2 \|	blob \| history
doc/plugins/po.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history
doc/plugins/write.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history