]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:40:56 +0000 (04:40 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:40:56 +0000 (04:40 +0100)
commit2121cac131765e0d7524e27e821b0bc4ceb36d40
tree5c9ec8199be281561a3bcc984f03ec66f7cc5da1
parentdb7243859de3cc1164066e44c0207f3b83a5dedf
parent408d483dc2938af527100f2201ceea0efb5019af
Merge commit 'upstream/master' into pub/master