Merge branch 'master' of ssh://repo.or.cz/srv/git/informe1syo
treee115c5f02321d03b8a20d0d4a6b34242812a440b
-rw-r--r-- 81 .gitignore
-rw-r--r-- 224 Makefile
-rw-r--r-- 2510 inf.tex