]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 11:33:30 +0000 (12:33 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 11:33:30 +0000 (12:33 +0100)
commit694a8dcbdd44a07e166baa1708563bc9e6fdff51
treeb4eb590f19100a85e231a203bd7658dae89455a5
parente54ec757d01fd77001fc5efe1942bdeea8ee468f
parentc67c35e8971886adb07fbe8d7c9db8a022be1756
Merge commit 'upstream/master'