]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin'
authorintrigeri <intrigeri@boum.org>
Mon, 3 Nov 2008 18:47:55 +0000 (19:47 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 3 Nov 2008 18:47:55 +0000 (19:47 +0100)

Trivial merge