]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/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)
commit33cade908232d636c623108b318f5b256fefceb1
tree5c9ec8199be281561a3bcc984f03ec66f7cc5da1
parent2e021e4bfa733db60c821d3788bb8c46445a7c15
parent408d483dc2938af527100f2201ceea0efb5019af
Merge commit 'upstream/master'