Merge branch 'lamp'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 25 Jan 2012 14:49:26 +0000 (15:49 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 25 Jan 2012 14:49:26 +0000 (15:49 +0100)
commita3d5ed82310d31f97963e8fc39ef57e7a0f982c4
treea1fe4e90f52d1d843e4ad3437be09c8d02933e43
parentba147517f4fe6e9474a6fa4fcd7aa606b0f4a99e
parent92c07b0849430263678fd7acf3ef40c812e90c66
Merge branch 'lamp'