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
..
content	Merge branch '3.0'	2012-07-04 18:24:17 -04:00
locale	Merge branch '3.0'	2012-07-01 11:41:31 -04:00
skin/default/zotero	Merge branch 'attachment-progress'	2012-06-10 21:56:15 -04:00