Simon Kornblith 45e28cf769 Merge branch '3.0' ... Conflicts: chrome/content/zotero/recognizePDF.js chrome/content/zotero/xpcom/cite.js		2012-12-19 23:16:56 -05:00
..
content	Merge branch '3.0'	2012-12-19 23:16:56 -05:00
locale	File sync overhaul	2012-12-11 15:16:40 -05:00
skin/default/zotero	File sync overhaul	2012-12-11 15:16:40 -05:00