win7 001
franco001
cambio 01
cambio 02
chavoq1
kiko01
Merge branch 'master' of
https://github.com/wilfredosystem/sistemaSBLM.git

Conflicts:
	src/com/sblm/bean/Prueba.java
valor01
Merge branch 'master' of
https://github.com/wilfredosystem/sistemaSBLM.git

Conflicts:
	src/com/sblm/bean/Prueba.java
aaaaaaa
Merge branch 'rama01'

Conflicts:
	src/com/sblm/bean/Prueba.java
borrado de vibora
aaaaaaa
valor 2 agregado
Merge branch 'master' into ramita
Merge branch 'master' of https://github.com/wilfredosystem/sistemaSBLM.git
cambio prueba2