Merge branch 'master' into 201405amv

This commit is contained in:
Dome 2014-06-14 10:29:44 +02:00
commit cfdcd9ed56

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
*.aux
*.toc
*.log
.DS_Store