Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 12 Nov 2013 10:12:01 +0000 (20:42 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 12 Nov 2013 10:12:01 +0000 (20:42 +1030)

Trivial merge