Recorded merge of already-integrated revisions 2378,2403-2404,2439,2442,2492,2541-2542,2554 via svnmerge from https://www.zotero.org/svn/extension/branches/1.0
This commit is contained in:
parent
3dd57d4369
commit
32a792b90f