Merge branch 'slapos-testing' slapos-0.118
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 7 Sep 2012 09:27:44 +0000 (11:27 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 7 Sep 2012 09:27:44 +0000 (11:27 +0200)
commitc737e941e89aa3d37c79cd329c539d2b19fa7ec2
tree1673f74a6503dd3b1c5fba5faeac3cc9673b8624
parent5b352747809ce6adca08e6d9c32bab2907716deb
parented9579b39491ac339d2496f9d7ac6e47e2b4f96d
Merge branch 'slapos-testing'