]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:15:18 +0000 (14:15 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:15:18 +0000 (14:15 +0100)
commit56e18bc00900debc2c3f457d013f366f4d3dea98
treebe53fac07764a1b20d08bb0eefb1f05b680b0e0d
parent9fe92640eb46f0afa24993b5c4957c054e62ae4d
parent71ea77a7806eadefd2f7aae839dc7d7346aad433
Merge commit 'upstream/master' into pub/master