Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sat, 17 Jan 2009 13:01:53 +0000 (14:01 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 17 Jan 2009 13:01:53 +0000 (14:01 +0100)
commit832d4d31d177d5d5f848250496048a00e9d70e2f
tree5fcda7f65be83ba15ae1ca321f77962bf3efd015
parent40de619d4968ecd7dc0086ca5118746bc3db3860
parent9e3bca852f9a39c43b4a7309b93ba9b0857ac4b9
Merge commit 'upstream/master' into prv/po

Conflicts:

IkiWiki/Plugin/editpage.pm
IkiWiki/Plugin/skeleton.pm.example
doc/plugins/write.mdwn
t/syntax.t
IkiWiki/Plugin/editpage.pm
IkiWiki/Plugin/skeleton.pm.example
doc/plugins/write.mdwn
t/syntax.t