no message
cambios
Merge branch 'master' of https://github.com/jpaddeo/stphalcon

Conflicts:
	.gitignore