]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:23:05 +0000 (22:23 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:23:05 +0000 (22:23 +0100)
commitcab2f55b6aa81753c3b3f757a24d52f3be522fcc
tree56f17453f5df71176fba58dd74c57998fcb4e587
parentb193b18e5ade1e04df3caea2c2201e087ff44d3e
parent32b86c5f5b8eef0fdeb2229159787cc3d9206a74
Merge commit 'upstream/master' into pub/master