Merge remote branch 'remotes/jwandborg/issue_363'

Conflicts:
	setup.py
This commit is contained in:
Christopher Allan Webber
2011-06-19 20:00:35 -05:00
7 changed files with 30 additions and 9 deletions

View File

@@ -43,6 +43,7 @@ setup(
'argparse',
'webtest',
'ConfigObj',
'Markdown',
## For now we're expecting that users will install this from
## their package managers.
# 'lxml',