From: Ralf Ertzinger <sun@lain.camperquake.de>
Date: Fri, 18 Apr 2008 20:14:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/videosite
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=48baaa8b607698f8839de3438d40e98085479789;hp=48baaa8b607698f8839de3438d40e98085479789;p=videosite.git

Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/videosite
---