]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/po
authorintrigeri <intrigeri@boum.org>
Sat, 6 Jun 2009 12:03:40 +0000 (14:03 +0200)
committerintrigeri <intrigeri@boum.org>
Sat, 6 Jun 2009 12:03:40 +0000 (14:03 +0200)
commit86edd73d169600875a10a635ef8df4a644545b0d
tree1216eb826f2da7a1c11d84395f25468d1acfa69c
parent17b3d73f6e65d6a754633902b0dd4716d53b03a9
parente40d2a6b2b1bdf677f11cc4a71595acf609d1e75
Merge commit 'upstream/master' into pub/po

Conflicts:

debian/changelog
debian/control

Signed-off-by: intrigeri <intrigeri@boum.org>
IkiWiki.pm
IkiWiki/Plugin/rename.pm
debian/changelog
debian/control
t/syntax.t