]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 18:09:47 +0000 (19:09 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 18:09:47 +0000 (19:09 +0100)
commitf7d89faec9f747a800564b6bd3f9bc155402e37d
tree39c2163c642153f43b3d046062dbf34c1df6dd57
parentb193b18e5ade1e04df3caea2c2201e087ff44d3e
parent408d483dc2938af527100f2201ceea0efb5019af
Merge commit 'upstream/master' into pub/master