]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/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)
commit2a8e2af9a2bc131db3f966f8235cd743da84b83e
treeb0e667725304a1daf07f3dbcb4b92a4acb280985
parente3b04285cec28cc3ab02270a5697dd7812b93927
parentbc705245ca4d3751bb21db8e9a1e1e5f3bbc92f8
Merge commit 'upstream/master' into pub/master