From: Lukasz Rekucki <lrekucki@gmail.com>
Date: Fri, 30 Oct 2009 23:25:06 +0000 (+0100)
Subject: Merge branch 'master' into lqc-trunk
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/eba3cb48e4c226b4229e2e38fa390672c3bcc829?hp=0f069f101a3e978c0f785dffe06ba873422c1137

Merge branch 'master' into lqc-trunk
---

diff --git a/requirements.txt b/requirements.txt
index acc34d99..3423647a 100644
--- 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