]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:42 +0000 (12:57 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:42 +0000 (12:57 +0100)
commit4e1782fb78da29b6d2f2b1b32657ca31ca9aec74
treed7dc6fb88ab1d559616436e82ea3b6c386a9532a
parent4ffe1575afc8607ce1ba0f1eded70b07a44efb37
parentebd9f4ce8ac37f5860a8c3eecaae39bd7ddb03e7
Merge commit 'upstream/master' into pub/master