Merge commit 'upstream/master' into prv/po

author intrigeri <intrigeri@boum.org>

Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)

committer intrigeri <intrigeri@boum.org>

Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
author intrigeri <intrigeri@boum.org>
Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
committer intrigeri <intrigeri@boum.org>
Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
diff --cc IkiWiki/Plugin/link.pm
Simple merge
diff --cc IkiWiki/Plugin/parentlinks.pm
Simple merge
diff --cc IkiWiki/Plugin/rename.pm
Simple merge
diff --cc doc/plugins/write.mdwn
Simple merge
author	intrigeri <intrigeri@boum.org>
	Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
committer	intrigeri <intrigeri@boum.org>
	Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
		1	2
IkiWiki/Plugin/link.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/parentlinks.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/rename.pm	patch \|	diff1 \|	diff2 \|	blob \| history
doc/plugins/write.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history