Merge branch 'apache'

software/apache-frontend/software.cfg

@@ -64,13 +64,14 @@ hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.8
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.2
+slapos.cookbook = 0.40
 
 # Required by:
 # slapos.core==0.23
 Flask = 0.8
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 PyXML = 0.8.4
 
 # Required by:
@@ -78,17 +79,17 @@ PyXML = 0.8.4
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 # slapos.core==0.23
 # xml-marshaller==0.9.7
 lxml = 2.3.3
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 netaddr = 0.7.6
 
 # Required by:
@@ -96,14 +97,14 @@ netaddr = 0.7.6
 netifaces = 0.8
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 # slapos.core==0.23
 # zc.buildout==1.6.0-dev-SlapOS-004
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 slapos.core = 0.23
 
 # Required by:
@@ -111,11 +112,11 @@ slapos.core = 0.23
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.40-dev
+# slapos.cookbook==0.40
 zc.recipe.egg = 1.3.2
 
 # Required by: