]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 5 Dec 2008 21:56:51 +0000 (22:56 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 5 Dec 2008 21:56:51 +0000 (22:56 +0100)
commit6836070c171d7a9b37c884320caefe312420d3f7
tree4450f8a0f6f009541b808e16a1c1c395e3288b87
parent2c19ce29ee915b0646a7676771902bd3933c5650
parent1506638f15797cc13155abfd8adb6ee34c0697bd
Merge commit 'upstream/master' into pub/master