]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 13:46:10 +0000 (14:46 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 13:46:10 +0000 (14:46 +0100)
commit44ca50db9d87142d860b1d9d959a27ede0402b0d
tree39c2163c642153f43b3d046062dbf34c1df6dd57
parent56e18bc00900debc2c3f457d013f366f4d3dea98
parent408d483dc2938af527100f2201ceea0efb5019af
Merge commit 'upstream/master' into pub/master