Simon Kornblith db313abc73 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-04-22 03:08:07 -04:00
..
content	Merge branch '4.0'	2013-04-22 03:08:07 -04:00
locale	Add missing string from d81e801685	2013-04-17 02:01:30 -04:00
skin/default/zotero	Remove -moz-border-radius (supplanted by border-radius)	2013-04-17 01:42:11 -04:00