Merge branch 'lamp' into master slapos-0.59
authorAlain Takoudjou <talino@tiolive.com>
Thu, 10 Nov 2011 08:32:12 +0000 (09:32 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Thu, 10 Nov 2011 08:32:25 +0000 (09:32 +0100)
commitda56db86b22dd60c2d0f58c3acb0ca9488e6c2fa
treecce67880697ac85ab2402f157d636b91afba6d72
parent2238a2e57d0526d5eb76281a62b16ca34fc8158f
parent94c7bbdd5ba57e61bb7bed52a1d00e95dff00a40
Merge branch 'lamp' into master