Merge branch 'master' of ozlabs.org:ccan
authorAhmed Samy <f.fallen45@gmail.com>
Mon, 14 Oct 2013 23:45:27 +0000 (01:45 +0200)
committerAhmed Samy <f.fallen45@gmail.com>
Mon, 14 Oct 2013 23:45:27 +0000 (01:45 +0200)

Trivial merge