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	Merge branch '3.0'	2013-02-04 07:02:38 -05:00