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

Trivial merge