Simon Kornblith dbf2bc265f Merge branch '3.0' ... Conflicts: chrome/content/zotero/recognizePDF.js chrome/content/zotero/xpcom/utilities.js		2013-01-21 02:01:08 -05:00
..
content	Merge branch '3.0'	2013-01-21 02:01:08 -05:00
locale	Merge branch '3.0' and modify recognizePDF.js to use promises	2013-01-21 01:04:05 -05:00
skin/default/zotero	Make date parts indicator match order in date itself	2013-01-11 22:31:27 -05:00