Merge branch 'master' of github.com:Atheros1/PyBitmessage
Merge branch 'master' of github.com:Atheros1/PyBitmessage
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Real logging, please incorporate into new and existing code.
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master
Update __init__.py
Update bitmessagemain.py
Update openssl.py
Nicer formatting
removed apparently unnecessary loop
removed apparently unnecessary loop
manual merge
Merge pull request #287 from Atheros1/master

gevent
Merge pull request #273 from xj9/logging

Real logging, please incorporate into new and existing code.
Merge pull request #280 from RemideZ/master

macOSX compatibility
Merge github.com:Bitmessage/PyBitmessage

Conflicts:
	src/class_receiveDataThread.py