Simon Kornblith 1bc98edba4 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/translation/translate_firefox.js install.rdf update.rdf		2012-10-29 18:04:42 -04:00
..
content	Merge branch '3.0'	2012-10-29 18:04:42 -04:00
locale	Merge branch '3.0'	2012-10-10 17:25:21 -04:00
skin/default/zotero	Merge branch '3.0'	2012-09-10 17:18:08 -04:00