Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 9 Nov 2013 10:17:20 +0000 (20:47 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 9 Nov 2013 10:17:20 +0000 (20:47 +1030)

Trivial merge