Merge branch 'lamp'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 14 May 2012 09:42:30 +0000 (11:42 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 14 May 2012 09:42:30 +0000 (11:42 +0200)
commit9fd2708e233cb903d7d500e0d15a5cc2d2d0800e
treebbd6c4d39ae4d524372ec68eeccb26bc1cb4e8fd
parent180b02902ace6e587b2232318d35662cfcd7c7e3
parentf828e70a23f4e87b4feee0a79a6afeadad998f65
Merge branch 'lamp'