Simon Kornblith 6de5cb4ab1 Merge branch '3.0' ... Conflicts: chrome/content/zotero/recognizePDF.js chrome/content/zotero/zoteroPane.js		2013-01-31 01:51:54 -05:00
..
zotero	Merge branch '3.0'	2013-01-31 01:51:54 -05:00
zotero-platform	File sync overhaul	2012-12-11 15:16:40 -05:00