tree 1564feaf49472df7014f8c9484aa72e8486846b3
parent 7e262a6d730f45d40645323c8462b4c480fe7319
parent 79eaa7efa2aaafd62ffeee7385526f14647e5a7e
author Alex Gaynor <alex.gaynor@gmail.com> 1383605099 -0800
committer Alex Gaynor <alex.gaynor@gmail.com> 1383605099 -0800

Merge branch 'master' into more-error-condition

Conflicts:
	tests/hazmat/bindings/test_openssl.py