]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/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)
commit9b474c2d488839ceec3637c3089eede45a715948
tree6ed10556aa4b4aae25775de26255a1ddd564d27a
parentd528db30216af50ac0c3c611a22a3deef25ab026
parent02ee6d40d403eac396cead15900b1441e3fe08d7
Merge commit 'upstream/master'