Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Alvaro del Castillo 2012-12-27
Parent(s): [53486d][c71998]
Child(ren): [5b21ce]
Alvaro del Castillo