Merge branch 'ronnie'
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 10 Nov 2010 05:17:12 +0000 (15:47 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Wed, 10 Nov 2010 05:17:12 +0000 (15:47 +1030)
commita40b318e7a07a452ae7456053727bd11b2fa49b4
treec1a18e7b831d7884ba2330f7032d53f13b14d027
parent7a163ea2dcafc056fdafc8c71ef011e2bfdbeb65
parent1c005e1223d2f8f664ce4b3be6cd7eb4dd449844
Merge branch 'ronnie'