Sylvain Wallez wrote:
[X] move template block to 2.1 and keep the old implementation
[ ] move template block to 2.1 and trash the old implementation
[ ] don't move template block to 2.1

That's IMO the safest thing to do in the maintenance branch.

Sylvain

--
Sylvain Wallez                        Anyware Technologies
http://bluxte.net                     http://www.anyware-tech.com
Apache Software Foundation Member     Research & Technology Director