Merge branch 'lxc'
authorAntoine Catton <acatton@tiolive.com>
Wed, 22 Aug 2012 07:49:06 +0000 (16:49 +0900)
committerAntoine Catton <acatton@tiolive.com>
Wed, 22 Aug 2012 07:49:06 +0000 (16:49 +0900)
commit694d13c882645e3825b5ea71cabe7d73302f3677
tree8723e15e96619fdee2701a3f54e9fbb211e4e532
parent909104427eca646239a924e54f506704f41eb537
parent2d1111a40ae809cbfdae7dd10653e09b2b733b0d
Merge branch 'lxc'

Conflicts:
component/slapos/buildout.cfg
slapos/recipe/pwgen.py
setup.py
slapos/recipe/pwgen.py
slapos/recipe/softwaretype.py