Merge branch 'tv/2544' into dev

Wayne Witzel III Wayne Witzel III 2011-08-09

changed Allura/allura/controllers/discuss.py
changed ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
changed Allura/allura/lib/macro.py
changed Allura/allura/tests/test_globals.py
Allura/allura/controllers/discuss.py Diff Switch to side-by-side view
Loading...
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/macro.py Diff Switch to side-by-side view
Loading...
Allura/allura/tests/test_globals.py Diff Switch to side-by-side view
Loading...