]> 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:14:07 +0000 (14:14 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:14:07 +0000 (14:14 +0100)
commit4668c290e9c625682c998afc38b76215a212fc10
tree2209ef7f111b18ec3ef4d2b4b0d4ef69d1648665
parent4e1782fb78da29b6d2f2b1b32657ca31ca9aec74
parent71ea77a7806eadefd2f7aae839dc7d7346aad433
Merge commit 'upstream/master' into pub/master