sesiones ok?
sesiones ok
sesiones ok
Boton
Boton
Boton
Boton
Boton
Merge branch 'master' of ssh://cafeteros-cocoroco.rhcloud.com/~/git/cafeteros

* 'master' of ssh://cafeteros-cocoroco.rhcloud.com/~/git/cafeteros:
  Boton
  Boton
  Boton
  Boton
  Boton
  sesiones ok
  sesiones ok
  sesiones ok?
Boton
Boton
He descomentado las cosas
Merge branch 'master' of ssh://cafeteros-cocoroco.rhcloud.com/~/git/cafeteros

* 'master' of ssh://cafeteros-cocoroco.rhcloud.com/~/git/cafeteros:
  Boton
  Boton