Merge branch 'master' of http://github.com/philc/vimium

* 'master' of http://github.com/philc/vimium:
  Revert a rename - not sure why I committed that.
  Oops, fixed a regression.
  Code cleanup & README changes for the multiple link hints patch.
  Fix some frame logic and disable focusing the largest one for now because it's buggy with iframes.
  A bunch of changes having to do with the frame support patch:
  Updated README
  Added ab3 to Credits ;)
  Clean up code
  added resetLinkHintsMode
  Added activeteLinkHintsModeWithQueue and resetLinkHintsMode to linkHints.js and added 'q cmd' and 'q help cmd' to commands.js
  Update README with new/changed key mappings.
  Command to go to next frame.
  Only show the Help Dialog on the focused frame.
  Fix view source toggle when inside a frame.
  Basic Support for Frames

Conflicts:

	commands.js
	manifest.json

1 files changed, 2 insertions, 0 deletions

diff --git a/CREDITS b/CREDITS
index 8c986adc..9f814f7a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -14,6 +14,8 @@ Contributors:
   lack
   markstos
   rodimius
+  Tim Morgan <tim@timmorgan.org> (github: seven1m)
   tsigo
+  Werner Laurensse (github: ab3)
 
 Feel free to add real names in addition to GitHub usernames.