Paul Sawaya bdee7877e3 Merge browser action CSS changes from master ... Fix browser action bug, more pin_locked->pinLocked Conflicts: browser_action/browser_action.css		2013-01-02 15:21:34 -08:00
..
browser_action.css	Merge browser action CSS changes from master	2013-01-02 15:21:34 -08:00
browser_action.html	Fix browser action bug, more pin_locked->pinLocked	2012-12-31 16:24:36 -08:00
browser_action.js	conflict merge from merging origin/master	2013-01-02 12:59:59 -08:00