Bla
Merge branch 'master' of github.com:comtesacristain/rdis

Conflicts:
	rdis/database.pyc