From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 18 Jun 2011 16:10:46 +0000 (-0500)
Subject: Merge branch 'master' into configobj
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c897283849abbe7f7e6506c2c3b179ff0fd3f9d2;p=mediagoblin.git

Merge branch 'master' into configobj

Conflicts:
	setup.py
---

c897283849abbe7f7e6506c2c3b179ff0fd3f9d2
diff --cc setup.py
index 37144b5b,ae5394eb..1ca12426
--- a/setup.py
+++ b/setup.py
@@@ -42,7 -42,7 +42,8 @@@ setup
          'translitcodec',
          'argparse',
          'webtest',
 +        'ConfigObj',
+         'lxml',
          ],
      test_suite='nose.collector',