tree 9f41314aef24c7da8ac6ebeb24a2623b5de0e530
parent ecf057406a63cd92f5473240d8477b43db0671a6
parent 4d7545c7341dcd52ff3dea00f72ea7815cf447cc
author Yaroslav Luzin <jardev@gmail.com> 1337182314 +0300
committer Yaroslav Luzin <jardev@gmail.com> 1337182314 +0300

Merge branch 'dev' into t48_blog_pull_in_rss

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