]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 00:47:04 +0000 (01:47 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 00:47:04 +0000 (01:47 +0100)
commitc9aac86735d73efc449ee20e1b366122fb55c4e1
treea3910a35657c137e70205853087ca1eccc8dd4a8
parent5c418d269304af618b142e0328742fc7d7157c62
parenta8090bfff8efba0f04b0ef547b052d2a13a19083
Merge commit 'upstream/master' into pub/master