Merge branch 'dev' of ssh://git.code.sf.net/p/allura/git
Authored by: Yaroslav Luzin 2012-03-23
Parent(s): [76dd52][c99674]
Child(ren): [229768][6ccf2b][6cd57c]