Merge branch 'master' of github.com:collab-project/django-encode

Author: thijstriemstra

.coveragerc

@@ -4,5 +4,6 @@ omit =
     setup.py
     runtests.py
     encode/tests/*
+    encode/migrations/*
     .tox/*
     doc/*

doc/conf.py

@@ -81,7 +81,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None