]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:29:36 +0000 (21:29 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:29:36 +0000 (21:29 +0100)
commited1673929562adb8747b2e6dca424df92d210013
tree8a118c9bf44999ae0622093d6f5a31708d4b05fc
parent2a8e2af9a2bc131db3f966f8235cd743da84b83e
parent32b86c5f5b8eef0fdeb2229159787cc3d9206a74
Merge commit 'upstream/master' into pub/master