Simon Kornblith f81f86c92d Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-04-04 02:05:23 -04:00
..
content	Merge branch '4.0'	2013-04-04 02:04:31 -04:00
locale	Fix newline symbols	2013-04-04 01:17:32 -04:00
skin/default/zotero	Increase width of quicksearch bar slightly	2013-04-01 01:43:59 -04:00