]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:41 +0000 (12:57 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:41 +0000 (12:57 +0100)

Trivial merge