Fix strange accesskeys in Standalone "(Print" & "Support and Documentation")
Fix Firefox charset warning displaying note editor
Fix items list freezing in some situations
Version bump
Avoid some unnecessary citation updates
Update submodules and repotime
Tweaks to duplicate detection
Merge pull request #252 from aurimasv/patch-1

Tweaks to duplicate detection
Revert "Merge pull request #252 from aurimasv/patch-1"

This reverts commit d2e42bda299c2e16fe88a08c0378bf6008146903, reversing
changes made to 8f263d0fd9a9a67eca43b6febd99be9d727ffdbf.
Duplicate detection tweaks (take 2)
Merge pull request #254 from aurimasv/duplicates

Duplicate detection tweaks (take 2)
Merge branch '3.0' into 3.1

Conflicts:
	chrome/content/zotero/tinymce/note.html
	chrome/content/zotero/tinymce/noteview.html
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
Merge branch '3.0' into 3.1
Merge pull request #258 from gracile-fr/3.0-access-key

Fix strange accesskeys in Standalone ("Print" & "Support and Documentation")
Show the startup error in the alert
Update maxVersion
Merge branch '3.1' of git://github.com/zotero/zotero into rtfscan2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch '3.1' of git://github.com/zotero/zotero into rtfscan2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.