Merge branch 'lamp'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 10 Jan 2013 16:53:25 +0000 (17:53 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 10 Jan 2013 16:53:25 +0000 (17:53 +0100)
commit2b821697e11069ca9c04c4c62e2a23918094caf3
tree18d94c7e19ab83edaf86394659d902559e8ee736
parent50deacd011fa5518223a7ebc353063717f93db9d
parent5d9239d3dd96e75bff8cbcef351c4cf5ef29f3e6
Merge branch 'lamp'