Merge remote-tracking branch 'gitorious/master'

2011-06-19 01:44:26 +02:00 · 2011-06-19 01:44:26 +02:00 · 76e21adbd8
commit 76e21adbd8
parent d81b39da4c f2f3fe33e9
2 changed files with 1 additions and 2 deletions
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@ -14,8 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-import pkg_resources
-
 from mediagoblin import celery_setup


--- a/setup.py
+++ b/setup.py
@ -42,6 +42,7 @@ setup(
        'translitcodec',
        'argparse',
        'webtest',
+        'lxml',
        ],
    test_suite='nose.collector',