Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Tim Van Steenburgh 2013-05-23
Parent(s): [621931][df1fe0]
Child(ren): [d41220]