bitcoin/bitcoin — pull request #4388 by Diapolo (2014-06-22 12:57:22+00:00)
Title: incremental net cleanup

I'm going to split of some changes from #4348 to make review easier and hopefully merging faster :).