Merge branch 'master' of ssh://dev.somenet.org:666/tu/lsdc
authorAndreas Egger <egger.andreas.1@gmail.com>
Mon, 24 Jun 2013 21:46:53 +0000 (23:46 +0200)
committerAndreas Egger <egger.andreas.1@gmail.com>
Mon, 24 Jun 2013 21:46:53 +0000 (23:46 +0200)

Trivial merge