Merge branch 'js/2549' into dev

Wayne Witzel III Wayne Witzel III 2011-10-07

changed Allura/allura/model/auth.py
changed Allura/allura/model/project.py
changed Allura/allura/lib/macro.py
changed Allura/allura/templates/jinja_master/lib.html
changed ForgeBlog/forgeblog/tests/unit/test_blog_post.py
changed scripts/create-allura-sitemap.py
Allura/allura/model/auth.py Diff Switch to side-by-side view
Loading...
Allura/allura/model/project.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/macro.py Diff Switch to side-by-side view
Loading...
Allura/allura/templates/jinja_master/lib.html Diff Switch to side-by-side view
Loading...
ForgeBlog/forgeblog/tests/unit/test_blog_post.py Diff Switch to side-by-side view
Loading...
scripts/create-allura-sitemap.py Diff Switch to side-by-side view
Loading...