]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:03 +0000 (21:34 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:03 +0000 (21:34 +0100)
commit4da365136ac123291d3b608adb3192311692182d
treef4ee5f6ad8ff0fb4b379706cdaab078b0ce3742a
parent24768a754c1f619fd9ffd3266461179b678edc91
parent5c0d43999f1e9eb0814eed3ccc0a91b030bb6a3e
Merge commit 'upstream/master' into pub/master