Simon Kornblith 48f90cb8b4 Merge remote-tracking branch 'origin/3.0' into 3.0		2012-02-01 17:25:26 -05:00
..
content	Merge remote-tracking branch 'origin/3.0' into 3.0	2012-02-01 17:25:26 -05:00
locale	Merge remote-tracking branch 'origin/3.0' into 3.0	2012-02-01 17:25:26 -05:00
skin/default/zotero	Explicitly specify width and height for urlbar icon	2012-02-01 01:42:27 -05:00