]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:32:02 +0000 (21:32 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:32:02 +0000 (21:32 +0100)

Trivial merge