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
..
content	Merge branch '4.0'	2013-03-23 17:35:19 -04:00
locale	Clarify WebDAV error messages	2013-03-22 17:47:35 -04:00
skin/default/zotero	Fix positioning of sync error popup	2013-03-22 17:56:53 -04:00