Simon Kornblith 903c3ed78e Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js		2013-04-01 01:11:52 -04:00
..
content	Merge branch '4.0'	2013-04-01 01:11:52 -04:00
locale	Fix bizarre newline symbols in fr-FR and ja-JP	2013-03-29 03:35:01 -04:00
skin/default/zotero	Shrink font size of quick copy prefpane instructions	2013-03-29 04:28:44 -04:00