commit | 11b20594535ddb984a82507c8dba94092a364062 | [log] [tgz] |
---|---|---|
author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Sat Jan 11 14:47:35 2014 -0500 |
committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Sat Jan 11 14:47:35 2014 -0500 |
tree | b3cd3cff07468085567285cea431a5aff75164d0 | |
parent | 19ad371f113be59b36b02b3e5ff73bf713906923 [diff] | |
parent | add057026d4e6fb3e3fbabc1fdde7b656e850925 [diff] |
Merge remote-tracking branch 'pyca/master' into release-0.14