Merge branch 'nooptionsinwallet+fixproxysetting' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 27 Feb 2012 16:30:05 +0000 (11:30 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 27 Feb 2012 16:30:05 +0000 (11:30 -0500)

Trivial merge