]> git.vomp.tv Git - vompserver.git/commitdiff
Merge branch 'master' of http://git.vomp.tv/vompserver
authorMarten Richter <marten.richter@freenet.de>
Sat, 19 Jan 2013 10:04:39 +0000 (11:04 +0100)
committerMarten Richter <marten.richter@freenet.de>
Sat, 19 Jan 2013 10:04:39 +0000 (11:04 +0100)

Trivial merge