Simon Kornblith 73f775950d Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/cite.js		2012-11-08 09:40:18 -05:00
..
engines.json	Don't unpack xpi	2012-01-29 15:15:23 -05:00
repotime.txt	Merge branch '3.0'	2012-11-08 09:40:18 -05: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