failed merge
authorJan Rocnik <jan.rocnik@student.tugraz.at>
Sun, 09 Sep 2012 21:06:30 +0200
changeset 42485ba06b41d46b3
parent 42481 5d3ff3464a2d
parent 42484 99d106acb1bb
child 42486 5335277f77d9
failed merge
doc-src/isac/jrocnik/eJMT-paper/jrocnik_eJMT.tex