Generar estados de cuenta OK
Empaquetamiento Funcion Pago
Empauqetamiento procedimiento Actulizar saldo credito
Contiuando con sucias
Merge remote-tracking branch 'David/master'

Conflicts:
	bd/all/init/init_all_sql_plus.sql
	protected/runtime/application.log
Merge remote-tracking branch 'Diego/master'

Conflicts:
	bd/all/init/init_all_sql_plus.sql
	bd/pt/creditos/pk_creditos_bod.sql
	protected/runtime/application.log
Creacion Paquete Informes
Generando Vista de informe credito
Triggers aportes y socios
Triggers aportes y socios
Merge Diego
Merge Rafael
Merge origin/master
Merge commit '480b8f7ca096c7fc7833e333df51b914c1f5efff'
arrgle empaquetamiento
Merge remote-tracking branch 'Nicolas/master'

Conflicts:
	bd/pt/creditos/pk_creditos_bod.sql
Estilo main
merge
Merge remote-tracking branch 'David/master'

Conflicts:
	bd/all/init/init_objects_dba_system.sql
	bd/all/init/init_security.sql
	protected/runtime/application.log.orig