]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Wed, 26 Nov 2008 06:57:15 +0000 (07:57 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 26 Nov 2008 06:57:15 +0000 (07:57 +0100)
commit97de9bb8605eaeb47edd4d80b444605676bb83e2
tree867db0dc31796403c69817b63c1b1062887afb87
parentd6b8805caf4fcf3f306a35edf4a0304634cf16b0
parentfbfe1e314c1a9437d9a5ffc1a8c60b6e1f9c8117
Merge commit 'upstream/master' into pub/master