Merged revision(s) 1885148-1885758 from turbine/core/branches/URLMapperService:


git-svn-id: https://svn.apache.org/repos/asf/turbine/core/trunk@1885760 13f79535-47bb-0310-9956-ffa450edef68
23 files changed