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
..
engines.json	Don't unpack xpi	2012-01-29 15:15:23 -05:00
repotime.txt	Merge branch '3.0'	2012-07-04 18:24:17 -04:00
system.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00
triggers.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00
userdata.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00