Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 1 Jan 2009 12:34:00 +0000 (13:34 +0100)
commit5c2f6cb8935f828274511ba5ca0d92b586632740
tree0c72d1f73c0424236a98a1d51d192ee5e0e507ae
parentc3af3840a295780e0f32df398f2dc7d34653e75e
parent8202cfe19e65867d7e41339944a8d7ca6daffa22
Merge commit 'upstream/master' into prv/po
IkiWiki/Plugin/link.pm
IkiWiki/Plugin/parentlinks.pm
IkiWiki/Plugin/rename.pm
doc/plugins/write.mdwn