Dan Stillman 0061ff3ca5 Merge branch '3.0' ... Conflicts: chrome/content/zotero/preferences/preferences.xul chrome/content/zotero/xpcom/data/item.js chrome/content/zotero/xpcom/utilities_translate.js		2013-02-04 07:02:38 -05:00
..
zotero-autocomplete.js	Fix "results.sort is not a function" in tags autocomplete	2013-02-04 05:03:12 -05: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