Merge branch 'erp5testnode-pyOpenSSL-0.14'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Mar 2014 10:11:40 +0000 (11:11 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Mar 2014 10:11:40 +0000 (11:11 +0100)
commitc56da5c437504f1fecbd97d012273103d2af9684
tree3a2e6d0aa01f3623aa9557c63dc5b1cde590c651
parent568ffc57ecd8c23f60f4f37984294149d2b17e25
parentedb4085ef18133f05b1cd23e3f3b9a608f336425
Merge branch 'erp5testnode-pyOpenSSL-0.14'

Conflicts:
component/python-cffi/buildout.cfg
component/python-cryptography/buildout.cfg
component/python-openssl/buildout.cfg