fechas y tiempos
:O
tercero
Merge branch 'convenios' of https://github.com/dannyd2c2/siciud into convenios

Conflicts:
	work/org/apache/jsp/adminConvenio/Documentos_jsp.class
	work/org/apache/jsp/adminConvenio/Documentos_jsp.java
	work/org/apache/jsp/adminConvenio/Verconvenio_jsp.class