bitcoin/bitcoin — pull request #5272 by Diapolo (2014-11-13 14:17:39+00:00)
Title: init: minor parameter interaction updates

- use __func__ instead of hard-coded function name for logging
- update -discover help message to reflect newly added parameter
interaction
- use DEFAULT_LISTEN in a parameter interaction check instead a hard coded
value