Merge branches 'compressed-keys' and 'memorypool' into master

This commit is contained in:
David A. Harding 2014-06-13 00:03:06 -04:00
commit f9949e1a82
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
7 changed files with 535 additions and 8 deletions

View file

@ -115,7 +115,7 @@ op codes: op code
'`op_return`': op_return
'`op_verify`': op_verify
orphan:
orphan: orphaned
orphaned: orphan
outputs: output
output:
output index: