d
Merge branch 'master' of https://github.com/tillmanc/Python-OracleNoSQL-Connector

Conflicts:
	setup.py