Merge branch 'master' of git://repo.or.cz/pyTivo/krkeegan
commitedb747718564c058a13dbca8f9e7358d83c7b792
authorwgw <tjm1100@gmail.com>
Sun, 2 Mar 2008 07:29:52 +0000 (2 01:29 -0600)
committerwgw <tjm1100@gmail.com>
Sun, 2 Mar 2008 07:29:52 +0000 (2 01:29 -0600)
tree8da24958e4b4852bd1a671dc1eb2cbf57ad50b24
parent76b6596620086bd3b1d7fa1349af03c5a538337e
parent48e5447199435cb9695489516056d65842b74acc
Merge branch 'master' of git://repo.or.cz/pyTivo/krkeegan
config.py
plugins/video/transcode.py