| commit | 4bdb6b54f56618a2d2cf73903b3b117436fe9fb8 | [log] [tgz] |
|---|---|---|
| author | Alex Gaynor <alex.gaynor@gmail.com> | Mon Nov 04 14:44:59 2013 -0800 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Mon Nov 04 14:44:59 2013 -0800 |
| tree | 1564feaf49472df7014f8c9484aa72e8486846b3 | |
| parent | 7e262a6d730f45d40645323c8462b4c480fe7319 [diff] | |
| parent | 79eaa7efa2aaafd62ffeee7385526f14647e5a7e [diff] |
Merge branch 'master' into more-error-condition Conflicts: tests/hazmat/bindings/test_openssl.py