Simon Kornblith dbf2bc265f Merge branch '3.0' ... Conflicts: chrome/content/zotero/recognizePDF.js chrome/content/zotero/xpcom/utilities.js		2013-01-21 02:01:08 -05: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 reports for notes with " " displaying as HTML markup	2012-11-21 19:42:47 -05:00
zotero-service.js	Merge branch '3.0'	2013-01-21 02:01:08 -05:00