Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 8 Jun 2012 10:58:01 +0000 (20:28 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 8 Jun 2012 10:58:01 +0000 (20:28 +0930)
commit9f5e1ef758d5b052a8df115f1d79c0c53e802ddf
tree7f6c00fdca59514d83bb415c7df612ae682163f1
parentea4bd098db51259f1a43054c0e93380d1687f2f3
parentb1f28e17227f2320d07fe052a8a48942fe17caa5
Merge branch 'master' of ozlabs.org:ccan