Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries Conflicts: SickBeard.py
midgetspy · May 11, 2011 · 8f45c4b · 8f45c4b
2 parents 631f576 + 7c7e22d
commit 8f45c4b
Show file tree

Hide file tree

Showing 88 changed files with 2,499 additions and 1,250 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 *.pyc
 cache/*
-cache.db
+cache.db*
 config.ini
 Logs/*
 sickbeard.db*