Dan Stillman aa730bb3bd Merge branch '4.0' ... Conflicts: chrome/content/zotero/fileInterface.js chrome/content/zotero/xpcom/translation/translate_item.js chrome/content/zotero/xpcom/utilities_internal.js chrome/content/zotero/zoteroPane.js		2015-05-23 18:26:32 -04:00
..
zotero	Merge branch '4.0'	2015-05-23 18:26:32 -04:00