Merge pull request #509 from globocom/develop

Develop

Author: boubeejul

requirements_docs.txt

@@ -22,7 +22,7 @@ json-delta==2.0
 json-spec[ip]==0.10.1
 kombu==3.0.37
 multiprocessing==2.6.2.1
-MySQL-python==1.2.3
+#MySQL-python==1.2.3
 netaddr==0.7.14
 #django-ldap-basic-auth==0.0.4
 newrelic==2.54.0.41