Simon Kornblith b3237ae5e5 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/http.js chrome/content/zotero/xpcom/translation/translate_firefox.js		2012-11-06 00:50:11 -05:00
..
zotero	Merge branch '3.0'	2012-11-06 00:50:11 -05:00