]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:42:00 +0000 (04:42 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:42:00 +0000 (04:42 +0100)
commit4ffe1575afc8607ce1ba0f1eded70b07a44efb37
treef8394eadf85ef8a9655018ce9b359f13c124dbb9
parentc0275aa17f44d7605f542461d800567dde7f79b8
parent8c47f16dccd8a4dd91f365233690bd8139431249
Merge commit 'upstream/master' into pub/master