-#3 Generacion de la Vista Concepto
Merge branch 'master' of http://github.com/jriverarojas/dirende

Conflicts:
	sis_directorio/base/data000001.sql