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

Merge branch 'devel'
---

debab097d66f3bd735e837a146bc81d09e420961