Merge branch 'xwiki'

software/xwiki/software.cfg

@@ -30,19 +30,19 @@ url = http://download.forge.objectweb.org/xwiki/xwiki-enterprise-web-2.7.war
 md5sum = c56e2cde96d28c5899a16a8270b6ff88
 
 [versions]
-#slapos.cookbook = 0.17
-#
-## Required by slapos.cookbook==0.17
-#slapos.core = 0.12
+slapos.cookbook = 0.17
+
+# Required by slapos.cookbook==0.17
+slapos.core = 0.13
 slapos.libnetworkcache = 0.2
-#collective.recipe.template = 1.8
-#netaddr = 0.7.5
-#xml-marshaller = 0.9.7
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88846
-#
-#hexagonit.recipe.cmmi = 1.5.0
-#hexagonit.recipe.download = 1.5.0
-#plone.recipe.command = 1.1
-#
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-005
\ No newline at end of file