Merge branch 'io'
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 14 Oct 2013 11:03:51 +0000 (21:33 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 14 Oct 2013 11:03:51 +0000 (21:33 +1030)
commit641b511049e5c03d45ada0c3fd829691b173e5d1
tree2b58278cdd742ede0460b75ac3e014fc0bcca210
parent158de63fda4e79ce3a632f25d444a1ec66f45d74
parentcece098555b7138082373d5c0ddfa8074da18dda
Merge branch 'io'