Merge branch 'ccantool'
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 19 Mar 2012 05:51:00 +0000 (16:21 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 19 Mar 2012 05:51:00 +0000 (16:21 +1030)
commit3ea7b4d695237414015f33674d6ba01009e77fd1
tree9dad679832fdd28b5990bf88c422c2054dff0514
parentb91dafc6ab5075355d508f051977a15dd7794b0e
parent624871f35e94510b9924ba733f2b878ecf2cc6cc
Merge branch 'ccantool'