Tidy up merge

1 files changed, 6 insertions, 0 deletions

diff --git a/commands.js b/commands.js
index 7c0f4a9d..b5d0a359 100644
--- a/commands.js
+++ b/commands.js
@@ -146,6 +146,9 @@ function clearKeyMappingsAndSetDefaults() {
     "x": "removeTab",
     "X": "restoreTab",
 
+    "b": "activateBookmarkFindMode",
+    "B": "activateBookmarkFindModeToOpenInNewTab",
+
     "gf": "nextFrame"
   };
 
@@ -207,6 +210,9 @@ var commandDescriptions = {
   removeTab: ["Close current tab", { background: true }],
   restoreTab: ["Restore closed tab", { background: true }],
 
+  activateBookmarkFindMode: ["Open a bookmark in the current tab"],
+  activateBookmarkFindModeToOpenInNewTab: ["Open a bookmark in a new tab"],
+
   nextFrame: ["Cycle forward to the next frame on the page", { background: true }]
 };