Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 13 Sep 2013 00:08:40 +0000 (09:38 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 13 Sep 2013 00:08:40 +0000 (09:38 +0930)

Trivial merge