bitcoin/bitcoin — pull request #904 by sipa (2012-02-26 22:46:01+00:00)
Title: No options in wallet + fix proxy settings

This is a version of #890 rebased on top of #899, plus an extra fix for storing the proxy port in the settings as well.