From: Ralf Ertzinger Date: Tue, 28 May 2013 19:54:24 +0000 (+0200) Subject: Merge branch 'devel' of ssh://ryoko:22003/home/sun/GIT/videosite into devel X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=2ef5353face7a41eea1db9eba7d360e82573753c Merge branch 'devel' of ssh://ryoko:22003/home/sun/GIT/videosite into devel --- 2ef5353face7a41eea1db9eba7d360e82573753c