]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 28 Nov 2008 13:19:47 +0000 (14:19 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 28 Nov 2008 13:19:47 +0000 (14:19 +0100)
commit0d3a41e39d35fc6f1b5edcffc674e1be40b85619
treee3094bf264bee4a3d18b8a85f61fa99aac7827ea
parent97de9bb8605eaeb47edd4d80b444605676bb83e2
parent708ff7870dfb9ae9e3d289f886433b82e016b58f
Merge commit 'upstream/master' into pub/master