Merge branch 'master' into lqc-trunk

diff --git a/requirements.txt b/requirements.txt
index acc34d9..3423647 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ mercurial==1.3.1
 librarian>=1.3.dev,<1.4
 django-piston==0.2.3rc1
 django-cas-consumer==0.1dev
-# MySQL-python>=1.2,<2.0
+Pygments>=1.1
+MySQL-python>=1.2,<2.0