]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 13:27:24 +0000 (14:27 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 13:27:24 +0000 (14:27 +0100)
commit9fe92640eb46f0afa24993b5c4957c054e62ae4d
tree4433e9a0ff50793c641ff3444663a73109342519
parentcab2f55b6aa81753c3b3f757a24d52f3be522fcc
parente7d04199ec730deecc95b55679515bc5618526f8
Merge commit 'upstream/master' into pub/master