]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
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)
1  2 
IkiWiki/Plugin/link.pm
IkiWiki/Plugin/parentlinks.pm
IkiWiki/Plugin/rename.pm
doc/plugins/write.mdwn

Simple merge
Simple merge
Simple merge
Simple merge