Merge branch 'master' of ssh://git.camperquake.de:22003/videosite
authorRalf Ertzinger <ralf@skytale.net>
Sat, 12 Apr 2014 16:24:02 +0000 (18:24 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sat, 12 Apr 2014 16:24:02 +0000 (18:24 +0200)

Trivial merge