[MergeMaster] Recuerdos de merche
Merge branch 'PruebasHito1'
[12/01/2013] MERCHE CON AMOR

Revert "Merge branch 'PruebasHito1'"

This reverts commit 167844d33c7573e44f7dbbddf9e53a1593b479a2, reversing
changes made to 3ccecd7e2c48032ea87fd1adb4ddcc04c88c9b7c.