From: Ralf Ertzinger Date: Tue, 7 May 2013 14:06:44 +0000 (+0200) Subject: Merge branch 'weechat' of http://10.200.0.3/GIT/videosite into weechat X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=edcf9a8b4edfbb1ea337640092f48ab2c7a78722 Merge branch 'weechat' of 10.200.0.3/GIT/videosite into weechat --- edcf9a8b4edfbb1ea337640092f48ab2c7a78722