From: Ralf Ertzinger <ralf@skytale.net>
Date: Sat, 29 Jun 2013 14:42:45 +0000 (+0200)
Subject: Merge branch 'devel'
X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=5420b8942fbbe6da34d37152f6079a5d98117596

Merge branch 'devel'
---

5420b8942fbbe6da34d37152f6079a5d98117596