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
..
zotero	Merge branch '4.0'	2013-04-15 01:28:20 -04:00
zotero-platform	Disable context menu icons on OS X	2013-04-14 01:47:05 -04:00