Added open-helpdesk to third-party apps list in README.
Issue 1102 - fixed UnicodeEncodeError when importing non-ascii files from zip.
Added River Satya to AUTHORS.
Merge
Added Maciej Szulik to AUTHORS
settings.py: additional checks for ImportError when importing local_settings

In its current state, settings.py catches and ignores all ImportErrors when
loading the local settings. While this behavior was intended to deal with
a missing local_settings.py, it also hides ImportErrors caused by import
statements *inside* local_settings.py, e.g.  for setting up deployment-specific
ldap authentication.

This simple fix will rethrow any ImportErrors that don't have "local_settings"
in their message.
Added Andreas Fleig to AUTHORS.
Fix local_settings import error check for Python 3.
Version bump to 3.1.10
Added tag 3.1.10 for changeset f2c0d062dfca
Update auto generated CHANGELOG and requirements.
Added mobilepartners.mozilla.org to sites in README.
Strip punctuation from keywords instead of non-alphanumeric chars, since languages like Hindi use characters that Python doesn't consider to be alphanumeric.
Merge branch 'master' into dynamic_mixins