cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	modulos/cartera/clases/carteradetalle.php
cambio