Simon Kornblith 505e4a5674 Merge branch '4.0'		2013-06-19 12:54:47 -04:00
..
content	Merge branch '4.0'	2013-06-19 12:54:47 -04:00
locale	Call Preferences "Preferences" in menu on all platforms	2013-06-19 12:52:04 -04:00
skin/default/zotero	Fix box scrolling	2013-05-23 23:27:29 -04:00