Upgrade MySQL-python to 1.2.5

This reverts commit 2ff0f636.

pavelib/prereqs.py

@@ -16,7 +16,6 @@ PYTHON_REQ_FILES = [
     'requirements/edx/github.txt',
     'requirements/edx/local.txt',
     'requirements/edx/base.txt',
-    'requirements/edx/post.txt',
 ]
 
 # Developers can have private requirements, for local copies of github repos,

requirements/edx/base.txt

@@ -51,6 +51,7 @@ Markdown==2.2.1
 --allow-unverified meliae
 meliae==0.4.0
 mongoengine==0.10.0
+MySQL-python==1.2.5
 networkx==1.7
 nose==1.3.3
 oauthlib==0.7.2

requirements/edx/post.txt

-# DON'T JUST ADD NEW DEPENDENCIES!!!
-#
-# If you open a pull request that adds a new dependency, you should notify:
-#   * @mollydb to check licensing
-#   * One of @e0d, @feanil, @fredsmith, @maxrothman, or @jibsheet
-#     to check system requirements
-
-# This must be installed after distribute has been updated.
-MySQL-python==1.2.4