Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Tim Van Steenburgh 2013-03-22
Parent(s): [036493][97765c]
Child(ren): [6ac00f]