From c728524c723e8752262de5ed4ab2bd75fbe9f227 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 31 Mar 2012 16:13:01 +0200
Subject: [PATCH] Made get_and_merge_cmdsets visible to default cmds.

---
 src/commands/cmdhandler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py
index a028f72acd..4f9a240cc6 100644
--- a/src/commands/cmdhandler.py
+++ b/src/commands/cmdhandler.py
@@ -81,7 +81,7 @@ class ExecSystemCommand(Exception):
 # Helper function
 
 @inlineCallbacks
-def _get_and_merge_cmdsets(caller):
+def get_and_merge_cmdsets(caller):
     """
     Gather all relevant cmdsets and merge them. Note
     that this is only relevant for logged-in callers.
@@ -171,7 +171,7 @@ def cmdhandler(caller, raw_string, testing=False):
     try: # catch bugs in cmdhandler itself
         try: # catch special-type commands
 
-            cmdset = yield _get_and_merge_cmdsets(caller)
+            cmdset = yield get_and_merge_cmdsets(caller)
             if not cmdset:
                 # this is bad and shouldn't happen.
                 raise NoCmdSets