Update version
Merge branch '3.1'
Merge branch '4.0'
Update version
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'
Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
Fix duplicate requests to provider sites

When the user follows a link from a proxy-by-port EZProxy to another
proxy-by-port EZProxy, we make an additional request to the target site
with no cookies. This yields a redirect to the EZProxy login page. We
use the query parameters to determine the true domain of the site.

Previously, we allowed the redirect to continue, and used the same code we
use to detect EZProxy logins to map the proxied domain to the true domain.
This caused duplicate requests to providers and apparently infinite loops.

We now read the query parameter directly from the redirect to the EZProxy
login page and then cancel the request so that the redirect doesn't get
followed.

The changeset also improves logging of proxy-related information.

See https://forums.zotero.org/discussion/28505/ for further discussion.
Merge branch '4.0'

Conflicts:
	install.rdf
	update.rdf
Apparently the dummy transaction hasn't been necessary since 2007 or so

https://bugzilla.mozilla.org/show_bug.cgi?id=380345
Remove use of deprecated pragma default_cache_size

Instead, set cache_size at runtime
Asynchronous DB query methods (experimental)

See comment in db.js for example usage.

This requires Firefox 20 or later unless we bundle the necessary code
modules ourselves.
Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/zotero.js
Remove isFx3, isFx31, isFx35, isFx36, isFx4, and isFx5
Fix Bug not being able to set attachmentBasePath.
Merge pull request #286 from lennart0901/master

Bug: Not able to set attachmentBasePath
Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
Fix abbreviation of single word titles

https://forums.zotero.org/discussion/28687/