Merge remote-tracking branch 'origin/master' into erp5
Conflicts: component/git/buildout.cfg component/openssl/buildout.cfg setup.py
Showing
component/nspr/buildout.cfg
0 → 100644
component/nss/buildout.cfg
0 → 100644
software/java/software.cfg
0 → 100644
software/pulse/instance.cfg
0 → 100644
software/pulse/software.cfg
0 → 100644
stack/sheepdogtestbed.cfg
0 → 100644
Please register or sign in to comment