From: Ralf Ertzinger Date: Sun, 23 Jun 2013 17:07:02 +0000 (+0200) Subject: Merge branch 'devel' of http://10.200.0.3/GIT/videosite into devel X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=55ed9957c9c46f6eaf491a821a60ef6c58b29f87 Merge branch 'devel' of 10.200.0.3/GIT/videosite into devel --- 55ed9957c9c46f6eaf491a821a60ef6c58b29f87