Merge remote-tracking branch 'origin/pr/47'
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 23 Aug 2016 03:39:44 +0000 (13:09 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 23 Aug 2016 03:39:44 +0000 (13:09 +0930)
Closes: 47

1  2 
ccan/crypto/sha256/sha256.c
ccan/crypto/sha256/sha256.h

Simple merge
Simple merge