]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:41 +0000 (12:57 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:41 +0000 (12:57 +0100)
commit715bad7967c763773d04a4d54ca81c9316c6e2de
treef8394eadf85ef8a9655018ce9b359f13c124dbb9
parentb19d19df7ab9d5d6a3ba1887d52457fed44c1333
parent4ffe1575afc8607ce1ba0f1eded70b07a44efb37
Merge commit 'origin/master'