]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 11:21:40 +0000 (12:21 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 11:21:40 +0000 (12:21 +0100)
commit24768a754c1f619fd9ffd3266461179b678edc91
tree6ed10556aa4b4aae25775de26255a1ddd564d27a
parent17f01c3237dd9a91ccb4bbc3ec13d75dc17285a0
parent02ee6d40d403eac396cead15900b1441e3fe08d7
Merge commit 'upstream/master' into pub/master