Merge branch 'Pablo2' of https://github.com/jpcardona/yonohagofila02.git into Pablo2
revision 22/08/2013 -mañanaxxxx
correo alarma
revision 22/08/2013 -mañanaxxxx------------------------////xxxxxxxxxx
alert
Merge pull request #19 from jpcardona/pablo10

Pablo10
Merge branch 'ricardo6' of https://github.com/jpcardona/yonohagofila02 into pablo10
Merge pull request #23 from jpcardona/jeison3

Jeison3
Merge branch 'master' of https://github.com/jpcardona/yonohagofila02 into pablo10
Super admin
Super admin
Merge branch 'Pablo2' of https://github.com/jpcardona/yonohagofila02 into pablo10
horas atencion local
Merge branch 'Pablo2' of https://github.com/jpcardona/yonohagofila02 into pablo10
bd con 61 locales
Merge branch 'Pablo2' of https://github.com/jpcardona/yonohagofila02 into pablo10
preloads
Merge branch 'Pablo2' of https://github.com/jpcardona/yonohagofila02 into pablo10
Moficaciones a la fecha .....
correos