]> git.vomp.tv Git - vompserver.git/commitdiff
Merge branch 'master' of ssh://git.vomp.tv:20022/vompserver
authorMarten Richter <marten.richter@freenet.de>
Sun, 13 Jul 2014 16:32:49 +0000 (18:32 +0200)
committerMarten Richter <marten.richter@freenet.de>
Sun, 13 Jul 2014 16:32:49 +0000 (18:32 +0200)

Trivial merge