Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 28 Oct 2013 11:20:58 +0000 (21:50 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 28 Oct 2013 11:20:58 +0000 (21:50 +1030)

Trivial merge