]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Wed, 3 Dec 2008 09:44:20 +0000 (10:44 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 3 Dec 2008 09:44:20 +0000 (10:44 +0100)
commit2c19ce29ee915b0646a7676771902bd3933c5650
treedd69aed7eb0127400deacefb3b739cb4e3fa922f
parent0d3a41e39d35fc6f1b5edcffc674e1be40b85619
parentfa72896cdc1c638095d25c8526107b0f07498282
Merge commit 'upstream/master' into pub/master