]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 00:51:00 +0000 (01:51 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 00:51:00 +0000 (01:51 +0100)

Trivial merge