Simon Kornblith 3726f81896 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-04-15 01:28:20 -04:00
..
content	Merge branch '4.0'	2013-04-15 01:28:20 -04:00
locale	Fix spacing in sync auto-merge dialogs	2013-04-13 03:44:09 -04:00
skin/default/zotero	Add icons to context menus	2013-04-13 01:53:02 -05:00