Merge branch 'master' of git://github.com/panchodiazc/Liquidacion
Merge branch 'master' of https://github.com/panchodiazc/Liquidacion