Merge
Merge branch 'master' of https://github.com/dariso/CI-1430
Merge pull request #64 from dariso/troncoSuspendido

Tronco suspendido