gggggg
ll
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	sistema/cadenaoriginal_3_2.xslt
	sistema/presentacion/html.php/facturas/factura_pdf.php
Merge branch 'master' of https://github.com/exprezzo/triples
Merge branch 'master' of https://github.com/exprezzo/triples
Merge branch 'master' of https://github.com/exprezzo/triples
Merge branch 'master' of https://github.com/exprezzo/triples
Merge branch 'master' of https://github.com/exprezzo/triples
Merge branch 'master' of https://github.com/exprezzo/triples
sd