Merge remote-tracking branch 'upstream/master'
treea8a583dc7faff0c08509c54b4111cffa5cbd4a1d
drwxr-xr-x - Cheetah
-rw-r--r-- 1217 README
-rw-r--r-- 55884 Zeroconf.py
-rw-r--r-- 6103 beacon.py
-rw-r--r-- 11995 config.py
drwxr-xr-x - content
-rw-r--r-- 12082 httpserver.py
-rw-r--r-- 6938 lrucache.py
-rwxr-xr-x 21880 metadata.py
-rw-r--r-- 9571 mind.py
drwxr-xr-x - mutagen
-rw-r--r-- 7905 plugin.py
drwxr-xr-x - plugins
-rw-r--r-- 3135 pyTivo.conf.dist
-rwxr-xr-x 2214 pyTivo.py
-rw-r--r-- 5332 pyTivoConfigurator.pyw
-rw-r--r-- 1236 pyTivoService.py
drwxr-xr-x - templates
drwxr-xr-x - xmpp