From: Marten Richter <marten.richter@freenet.de>
Date: Sat, 19 Jan 2013 10:04:39 +0000 (+0100)
Subject: Merge branch 'master' of http://git.vomp.tv/vompserver
X-Git-Tag: 0-5-0~8
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=1c2011210bc75217b8e737519912bc1af89a2f15;p=vompserver.git

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

1c2011210bc75217b8e737519912bc1af89a2f15