Simon Kornblith 6d56004e35 Merge branch '3.0'		2012-04-11 10:32:40 -04:00
..
content	Merge branch '3.0'	2012-04-11 10:32:40 -04:00
locale	Make additional fields available as columns with a submenu (fixes #84)	2012-03-24 19:39:14 +01:00
skin/default/zotero	Merge branches '3.0' and 'master'	2012-04-09 11:27:01 -04:00