From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 20 Jun 2011 01:00:35 +0000 (-0500)
Subject: Merge remote branch 'remotes/jwandborg/issue_363'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0692c01e4c7b88ce94fe023607109fb978c36c2e;p=mediagoblin.git

Merge remote branch 'remotes/jwandborg/issue_363'

Conflicts:
	setup.py
---

0692c01e4c7b88ce94fe023607109fb978c36c2e
diff --cc setup.py
index cd0e7f0b,fb86d600..2a007f4e
--- a/setup.py
+++ b/setup.py
@@@ -42,10 -42,7 +42,11 @@@ setup
          'translitcodec',
          'argparse',
          'webtest',
 +        'ConfigObj',
+         'Markdown',
 +        ## For now we're expecting that users will install this from
 +        ## their package managers.
 +        # 'lxml',
          ],
      test_suite='nose.collector',