]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 21 Nov 2008 15:09:33 +0000 (16:09 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 21 Nov 2008 15:09:33 +0000 (16:09 +0100)
commit5c418d269304af618b142e0328742fc7d7157c62
treef163d3f51ee40a6b24f1224e717d2b76ad1a21bd
parent5c7771e01aafb7b2e197f58a725132e4c2f4bde8
parent7d11e73f5737852d0fc9712741a6ef6561e5709e
Merge commit 'upstream/master' into pub/master