]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/po
authorintrigeri <intrigeri@boum.org>
Mon, 20 Apr 2009 10:21:18 +0000 (12:21 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 20 Apr 2009 10:21:18 +0000 (12:21 +0200)
commit4558457402a4ab6bc795589a2e400fa66144f76e
tree8368320617a8febc3c9c9708f688b6591801f4c0
parent9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e
parent2cc3f5d057c5882e08d16746985c49a7dd1a4c01
Merge commit 'upstream/master' into pub/po

Conflicts:

debian/changelog
debian/control
IkiWiki.pm
debian/changelog
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn