Dan Stillman 81e94b4475 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/schema.js		2013-08-15 23:32:32 -04:00
..
zotero	Merge branch '4.0'	2013-08-15 23:32:32 -04:00
zotero-platform	Disable context menu icons on OS X	2013-04-14 01:47:05 -04:00