Simon Kornblith 723213f11f Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/translation/translate_firefox.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2012-07-04 18:24:17 -04:00
..
zotero	Merge branch '3.0'	2012-07-04 18:24:17 -04:00
zotero-platform	Merge branch '3.0'	2012-03-20 02:16:43 -04:00