Merge branch 'seleniumrunner' into erp5testnode
authorSebastien Robin <seb@nexedi.com>
Thu, 24 Jan 2013 13:27:16 +0000 (14:27 +0100)
committerSebastien Robin <seb@nexedi.com>
Thu, 24 Jan 2013 13:27:16 +0000 (14:27 +0100)
commit7d7cac926e90c7becdc2b8242f4bb428876900ff
tree13d3a7d8c83fe843b3ce6f302c4a70774bc01bef
parentf04e0a75b0c8cc8d9a3867a8242034e5f877d5d3
parent584d66e7c22bef40337ec9a031600c414d27cd48
Merge branch 'seleniumrunner' into erp5testnode

Conflicts:
component/ca-certificates/buildout.cfg
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg