Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Wayne Witzel III 2013-02-06
Parent(s): [46037a][a7c647]
Child(ren): [a7ba57]