brianchandotcom/liferay-portal — pull request #6911 by epgarcia (2012-09-14 08:50:27+00:00)
Title: LPS-28327 Add useful ADT Velocity samples

Hey Brian,

I solved the conflict with the help of Sergio.

Thanks

@JorgeFerrer
@juanferrub