Merge branch 'master' into reorg
tree2ad14cd19f9654da5d3484b94cd72521ed61429e
-rw-r--r-- 28 .gitignore
-rw-r--r-- 2314 README
-rw-r--r-- 9419 ez_setup.py
-rw-r--r-- 2910 pyTivo.conf.dist
drwxr-xr-x - pyTivo
-rw-r--r-- 676 setup.py