Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
commitcefa6f9ef6abf65dd528d547ef5f7155dd184385
authorlucas_nz <lucas_nz@hotmail.com>
Fri, 17 Aug 2012 11:00:14 +0000 (17 23:00 +1200)
committerlucas_nz <lucas_nz@hotmail.com>
Fri, 17 Aug 2012 11:00:14 +0000 (17 23:00 +1200)
tree17746b1827617c71cad20d001f7cf7e1372e99d0
parent0c7842c264cd98943a06c4208924b0e12e2d9dc7
parentdb601b3f373afecc4eeace406aacee5b0293b31b
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
config.py
httpserver.py
plugins/video/transcode.py
plugins/video/video.py