Merge branch 'master' of git.realraum.at:documents
authorBernhard Tittelbach <bernhard@tittelbach.org>
Tue, 31 Mar 2015 10:51:20 +0000 (12:51 +0200)
committerBernhard Tittelbach <bernhard@tittelbach.org>
Tue, 31 Mar 2015 10:51:20 +0000 (12:51 +0200)

Trivial merge