Merge branch 'slapos'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 6 Jul 2012 13:27:51 +0000 (15:27 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 6 Jul 2012 13:27:51 +0000 (15:27 +0200)
commite798c9a7bc6dbd3d912df1e3cb1edb66652d67bf
tree0eca612df71958a3b67872ff67d1197000b25435
parent2eaca026035655facd96b107c4c21b9648dd4178
parentf68d90f8be6807cb0ed40d788abb9ddcd9bcd28f
Merge branch 'slapos'