Merge branch 'master' of wmcbrine into beta-wgw
tree647f7f77b1aa80f8abb875160635e5c0105c5b38
-rw-r--r-- 28 .gitignore
drwxr-xr-x - Cheetah
-rw-r--r-- 2271 README
-rw-r--r-- 2330 beacon.py
-rw-r--r-- 7451 config.py
drwxr-xr-x - eyeD3
-rw-r--r-- 3936 httpserver.py
-rw-r--r-- 6774 lrucache.py
-rw-r--r-- 5718 plugin.py
drwxr-xr-x - plugins
-rw-r--r-- 2174 pyTivo.conf.dist
-rwxr-xr-x 483 pyTivo.py
-rw-r--r-- 6341 pyTivoConfigurator.pyw
-rw-r--r-- 1488 pyTivoService.py
drwxr-xr-x - templates