]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 5 Dec 2008 21:56:51 +0000 (22:56 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 5 Dec 2008 21:56:51 +0000 (22:56 +0100)

Trivial merge