]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:37:57 +0000 (12:37 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:37:57 +0000 (12:37 +0100)
commit8ded9f57a12a27fa5fc1e272ec7b2d2a5aa28419
tree67975f3ca74a4e38e5a56052e45a3898f82807bc
parent70353c5807ca950ad652ea9da19665631369d5a6
parent256b3aeba8a1a9e41c2e89d9030a1a55be060540
Merge commit 'upstream/master' into pub/master