]> 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:02:55 +0000 (12:02 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:02:55 +0000 (12:02 +0100)
commit70353c5807ca950ad652ea9da19665631369d5a6
treebb2498f5afa0d68f8b0923bb2e7b44b7472c9091
parentb193b18e5ade1e04df3caea2c2201e087ff44d3e
parent466ceb13946699cbd6b0ef0cad8f3040804265ae
Merge commit 'upstream/master' into pub/master