From: Marten Richter <marten.richter@freenet.de>
Date: Sun, 13 Jul 2014 16:32:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.vomp.tv:20022/vompserver
X-Git-Tag: 0-5-0~7
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=a5e265632dc24b2484bb552349df80507f099f6a;p=vompserver.git

Merge branch 'master' of ssh://git.vomp.tv:20022/vompserver
---

a5e265632dc24b2484bb552349df80507f099f6a