Merge branch 'LV2'
authorIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Thu, 7 Apr 2016 15:12:53 +0000 (17:12 +0200)
committerIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Thu, 7 Apr 2016 15:12:53 +0000 (17:12 +0200)

Trivial merge