Simon Kornblith 57c3d190b4 Merge branch 'kill-e4x' ... Conflicts: chrome/content/zotero/xpcom/integration.js		2012-06-25 00:42:32 -04:00
..
zotero-autocomplete.js	Fix sorting of autocomplete tags dropdown (since Fx9 or so)	2012-05-10 18:55:17 -04:00
zotero-protocol-handler.js	Fix sorting of base-mapped fields in reports	2012-04-26 16:28:55 -04:00
zotero-service.js	Merge branch 'kill-e4x'	2012-06-25 00:42:32 -04:00