Dan Stillman ee16d96f92 Merge branch '3.0' ... Conflicts: chrome/content/zotero/preferences/preferences.xul chrome/content/zotero/xpcom/storage/webdav.js chrome/locale/gl-ES/zotero/zotero.dtd chrome/locale/gl-ES/zotero/zotero.properties chrome/locale/zh-CN/zotero/zotero.dtd chrome/locale/zh-CN/zotero/zotero.properties install.rdf update.rdf		2013-02-16 05:07:59 -05:00
..
engines.json	Merge branch '3.0'	2012-11-12 16:04:39 -05:00
repotime.txt	Merge branch '3.0'	2013-02-16 05:07:59 -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