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

Merge conflicts
---

afa7a5fdc46733dcf5d900cc008b2e7261888eac