j
Merge branch 'master' of
https://github.com/gcorreageek/proyAlmacenes.git

Conflicts:
	Sigal/src/ConfiguracionIbatis.xml