Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Authored by: Tim Van Steenburgh 2012-12-19
Parent(s): [1e4dc4][65ccd2]
Child(ren): [dfb062]