Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 8 Feb 2013 09:49:03 +0000 (10:49 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 8 Feb 2013 09:49:03 +0000 (10:49 +0100)
commit87e598d943b31c7e3c9dc79466a0bbf97f30d4f7
tree509f24e3020f55ca8c8e0fc545a34142701beece
parentdf8a5b1defd7473b147bf69cc4aabe0fe95aa28a
parente9e8b1d5a5f06009f1bdc91cca3df240921871ab
Merge branch 'master' into slapos