Commit [66d197] 42cc_4181  Maximize  Restore  History

Merge branch 'dev' into t48_blog_pull_in_rss

Conflicts:
Allura/allura/command/__init__.py
Allura/allura/tests/test_commands.py
Allura/setup.py