Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <robert@widebook.box.kairo.at>
Fri, 23 May 2014 17:53:39 +0000 (19:53 +0200)
committerRobert Kaiser <robert@widebook.box.kairo.at>
Fri, 23 May 2014 17:53:39 +0000 (19:53 +0200)

Trivial merge