Simon Kornblith 0805a943ba Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-05-09 22:12:10 -04:00
..
content	Merge branch '4.0'	2013-05-09 22:12:10 -04:00
locale	Add new string to other locales	2013-05-02 01:28:04 -04:00
skin/default/zotero	Remove -moz-border-radius (supplanted by border-radius)	2013-04-17 01:42:11 -04:00