Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Tim Van Steenburgh 2013-07-07
Parent(s): [19c767][6901e8]
Child(ren): [33e7fe]