Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Wayne Witzel III 2012-12-12
Parent(s): [03b9fa][e90237]
Child(ren): [9fbad0]