From: Marten Richter Date: Sun, 18 Nov 2012 15:11:03 +0000 (+0100) Subject: Merge branch 'master' of http://git.vomp.tv/vompserver X-Git-Tag: 0-5-0~9 X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=1e83b0264fd1ed0a25fd1b572e4bdd4933e150b2;p=vompserver.git Merge branch 'master' of http://git.vomp.tv/vompserver --- 1e83b0264fd1ed0a25fd1b572e4bdd4933e150b2