]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:52:19 +0000 (11:52 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:52:19 +0000 (11:52 +0100)
commitf38a64a9a7965f06b204d50e739db5b5a5cfe306
treeb0e667725304a1daf07f3dbcb4b92a4acb280985
parent3e33482342cf99664662610a18059dce60fbbd44
parentbc705245ca4d3751bb21db8e9a1e1e5f3bbc92f8
Merge commit 'upstream/master'