Dan Stillman feb47caa6b Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/translation/translate.js		2014-08-06 22:13:05 -04:00
..
zotero	Merge branch '4.0'	2014-08-06 22:13:05 -04:00
zotero-platform	Restore highlighting of collection row during drag on Windows	2014-07-20 02:16:20 -04:00