]> 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:51:48 +0000 (01:51 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 00:51:48 +0000 (01:51 +0100)
commitfe04efa1b8fce2524faa96378a049e9e7118f481
treea3cddc21d2bb5db15ff93661214027d14849172c
parentc9aac86735d73efc449ee20e1b366122fb55c4e1
parent8adc460bb12fb2040197ce1de6e885f74a389b84
Merge commit 'upstream/master' into pub/master