Merge branch 'master' into configobj

Conflicts: setup.py
2011-06-18 11:10:46 -05:00
parent e2c6436e3e 5a994e37c2
commit c897283849
8 changed files with 120 additions and 7 deletions
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ setup(
        'argparse',
        'webtest',
        'ConfigObj',
+        'lxml',
        ],
    test_suite='nose.collector',