]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 20 Oct 2008 12:33:19 +0000 (14:33 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 20 Oct 2008 12:33:19 +0000 (14:33 +0200)
1  2 
IkiWiki.pm
doc/plugins/write.mdwn

diff --cc IkiWiki.pm
Simple merge
Simple merge