henrikelopez/githubtest — pull request #11 by henrikelopez (2014-08-23 18:31:14+00:00)
Title: Merge origin/master into julio

Conflicts:
henry.php

tambien subi mi cambio