]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:02 +0000 (21:34 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:02 +0000 (21:34 +0100)
commitcd279b55ba5563809c6fcb476f51ee4d0e730c97
tree6ed10556aa4b4aae25775de26255a1ddd564d27a
parent9b474c2d488839ceec3637c3089eede45a715948
parent24768a754c1f619fd9ffd3266461179b678edc91
Merge commit 'origin/master'