Simon Kornblith 585e5981f6 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/storage/webdav.js chrome/content/zotero/xpcom/storage/zfs.js		2012-11-12 16:04:39 -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	Merge commit '920df48d1da4f9bf33bf1a01c60a2131e589d29c' into 3.0	2012-11-12 00:09:23 -05:00
zotero-service.js	Add ZoteroPaneOpen command line argument to open Zotero automatically	2012-11-10 19:38:22 -05:00