Merge branch 'master' into erp5-component

software/jio/instance.cfg.in

@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
 
 [phantomjs-wrapper]
 recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/bin/phantomjs
+command-line = ${phantomjs:location}/phantomjs-slapos
 wrapper-path = $${directory:bin}/phantomjs
-parameters_extra = true
\ No newline at end of file
+parameters_extra = true

software/jio/software.cfg

@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 # MD5 checksum can be skipped for development, but must be filled for production
-md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
+md5sum = 94421503ca09f77ee1e94e4b1ef4e6a7
 mode = 0644
 
 [jio-repository]