Merge branch 'master' into filter-hints

Conflicts:
	CREDITS
	commands.js

1 files changed, 1 insertions, 1 deletions

diff --git a/options.html b/options.html
index 44b1d3e2..1724f51b 100644
--- a/options.html
+++ b/options.html
@@ -87,7 +87,7 @@
     "userDefinedLinkHintCss", "keyMappings", "filterLinkHints"];
 
   var postSaveHooks = {
-    "keyMappings": function (value) {
+    keyMappings: function (value) {
       backgroundPage = chrome.extension.getBackgroundPage();
       backgroundPage.clearKeyMappingsAndSetDefaults();
       backgroundPage.parseCustomKeyMappings(value);