Simon Kornblith d8e2007da4 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-03-23 17:35:19 -04:00
..
zotero	Merge branch '4.0'	2013-03-23 17:35:19 -04:00
zotero-platform	File sync overhaul	2012-12-11 15:16:40 -05:00