tree 429d75fed3913c101bafeaf639eec4fa5a853fa6
parent acf8ae43ad9343613862fb06f1a1588763d01bd7
author Michael Semb Wever <mck@apache.org> 1383475876 +0000
committer Michael Semb Wever <mck@apache.org> 1383475876 +0000

svn merge -c1538332 ^/tiles/request/branches/TREQ_1_0_X .

> Use the new tiles-master-6
> http://thread.gmane.org/gmane.comp.apache.tiles.devel/595


git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1538334 13f79535-47bb-0310-9956-ffa450edef68