]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://gitosis@vcs.gaffer.ptitcanardnoir.org/ikiwiki
authorintrigeri <intrigeri@boum.org>
Wed, 5 Nov 2008 00:40:41 +0000 (01:40 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 5 Nov 2008 00:40:41 +0000 (01:40 +0100)

Trivial merge