Merge branch 'master' of gitlab.cs.fau.de:ik15ydit/latexandmore

This commit is contained in:
Sheppy 2017-02-08 16:09:27 +01:00
commit 9dd6d9e76e