]> git.vomp.tv Git - vompserver.git/commitdiff
Merge branch 'master' of http://git.vomp.tv/vompserver
authorMarten Richter <marten.richter@freenet.de>
Sun, 18 Nov 2012 15:11:03 +0000 (16:11 +0100)
committerMarten Richter <marten.richter@freenet.de>
Sun, 18 Nov 2012 15:11:03 +0000 (16:11 +0100)

Trivial merge