merge conflict : freeze versions

component/slapos/buildout.cfg

@@ -47,14 +47,14 @@ lxml = 2.3
 meld3 = 0.6.7
 netaddr = 0.7.5
 setuptools = 0.6c12dev-r88846
-slapos.core = 0.11
+slapos.core = 0.12
 slapos.libnetworkcache = 0.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.11
+# slapos.core==0.12
 Flask = 0.7.2
 
 # Required by:
@@ -62,13 +62,14 @@ Flask = 0.7.2
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.11
+# slapos.core==0.12
 netifaces = 0.5
 
 # Required by:
-# slapos.core==0.11
+# slapos.core==0.12
 supervisor = 3.0a10
 
 # Required by:
-# slapos.core==0.11
+# slapos.core==0.12
 zope.interface = 3.6.4
+