Dan Stillman bfaa0f1172 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/db.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-08-08 01:06:35 -04:00
..
zotero	Merge branch '4.0'	2013-08-08 01:06:35 -04:00
zotero-platform	Disable context menu icons on OS X	2013-04-14 01:47:05 -04:00