Merge branch 'master' of ssh://repo.or.cz/srv/git/informe1syomaster
commit963a487f446bb8b591abe053d65ea903e25ba08b
authorYonathan Dossow <ydossow@gitmo.bla.cl>
Wed, 29 Apr 2009 15:45:49 +0000 (29 11:45 -0400)
committerYonathan Dossow <ydossow@gitmo.bla.cl>
Wed, 29 Apr 2009 15:45:49 +0000 (29 11:45 -0400)
tree783760d96e3d0053bd14e66d27d9b6085edda650
parent4c6edacf2eb4e21439140cfa8981519c9ce901f1
parentf2d5ea50154b2cf91b4242601450fbdf72a85498
Merge branch 'master' of ssh://repo.or.cz/srv/git/informe1syo

Conflicts:
inf.tex

Signed-off-by: Yonathan Dossow <ydossow@gitmo.bla.cl>
inf.tex