Dan Stillman f92ed125b6 Merge branch '3.0' into 3.1 ... Conflicts: chrome/content/zotero/tinymce/note.html chrome/content/zotero/tinymce/noteview.html chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-02-25 12:46:43 -05:00
..
content	Merge branch '3.0' into 3.1	2013-02-25 12:46:43 -05:00
locale	Support journal abbreviations	2013-02-24 05:57:28 -05:00
skin/default/zotero	Unprefix some CSS properties	2013-02-22 18:48:59 -05:00