Simon Kornblith 9ea12d5561 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/translation/translate_item.js		2012-10-10 17:25:21 -04:00
..
zotero	Merge branch '3.0'	2012-10-10 17:25:21 -04:00