Merge branch 'slapos-testing'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Nov 2012 09:16:11 +0000 (09:16 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Nov 2012 09:16:11 +0000 (09:16 +0000)
commit721b8459604ce6d3199b1f4135756e6aaa6c18fe
tree5566f423157f5a8fe5f734f64d3c8aaaaf0fa458
parentf0965b8b1d6a74e329a55d152389c2978f8fafe2
parentc9f60c1e5b71e74f24b0abddde1182c2298c18b3
Merge branch 'slapos-testing'