From: Ralf Ertzinger <sun@ryoko-darknet.camperquake.de>
Date: Mon, 8 Dec 2008 14:05:38 +0000 (+0100)
Subject: Merge branch 'master' of http://10.200.0.3/GIT/videosite
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;ds=inline;h=cd16642959c6d3583f276ae62e231f3552ef57c6;hp=-c;p=videosite.git

Merge branch 'master' of 10.200.0.3/GIT/videosite
---

cd16642959c6d3583f276ae62e231f3552ef57c6