Merge branch 'tv/4553' into dev

Tim Van Steenburgh Tim Van Steenburgh 2012-08-10

changed Allura/development.ini
changed Allura/test.ini
changed ForgeActivity/forgeactivity/tests/functional/test_root.py
changed requirements-common.txt
changed requirements-common.txt
changed requirements-sf.txt
changed requirements.txt
Allura/development.ini Diff Switch to side-by-side view
Loading...
Allura/test.ini Diff Switch to side-by-side view
Loading...
ForgeActivity/forgeactivity/tests/functional/test_root.py Diff Switch to side-by-side view
Loading...
requirements-common.txt Diff Switch to side-by-side view
Loading...
requirements-common.txt Diff Switch to side-by-side view
Loading...
requirements-sf.txt Diff Switch to side-by-side view
Loading...
requirements.txt Diff Switch to side-by-side view
Loading...