Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Sun, 12 Feb 2012 11:11:48 +0000 (12:11 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Sun, 12 Feb 2012 11:11:48 +0000 (12:11 +0100)
commit413b416a5fd70778bffcd6d1233de6543069beac
tree81bbfafafb089057b81e0b18b6083299027ca9ec
parent34a5f2d1328fd6d6a0ba154f03824e114e0a7bbc
parentab932c2e16ac347c8afe31ab77bd8bf350be4a3f
Merge branch 'master' into slapos