Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 08:50:27 +0000 (09:50 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 08:50:27 +0000 (09:50 +0100)
commitae474d8e14631ff519ed7d54bb64eaa0538f56d9
tree09637db5faf2632b67b581cf04463fe4493584d4
parent0314ed459ba1c49fad9170a54cc05f1c9e9c96bf
parent08e4472fc469c630ebef93e16a66a5a69d9cb33a
Merge commit 'upstream/master' into prv/po

Conflicts:

IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
debian/control
debian/copyright
doc/plugins/write.mdwn