Merge branch 'master' into matthiaskrgr/dance
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 6 Mar 2015 14:45:07 +0000 (15:45 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 6 Mar 2015 14:45:07 +0000 (15:45 +0100)

Trivial merge