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
..
zotero	Merge branch '3.0'	2013-02-16 05:07:59 -05:00
zotero-platform	File sync overhaul	2012-12-11 15:16:40 -05:00