Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/src/commandhandler.h b/src/commandhandler.h
index 0b3146af8..809e9e517 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -177,6 +177,11 @@ class CommandHandler
         void handleBlackList(const std::string &args, ChatTab *tab);
 
         /**
+         * Handle an enemy command.
+         */
+        void handleEnemy(const std::string &args, ChatTab *tab);
+
+        /**
          * Handle an erase command.
          */
         void handleErase(const std::string &args, ChatTab *tab);
@@ -234,6 +239,11 @@ class CommandHandler
         void handleAway(const std::string &args, ChatTab *tab);
 
         /**
+         * Handle pseudo away command.
+         */
+        void handlePseudoAway(const std::string &args, ChatTab *tab);
+
+        /**
          * Handle follow command.
          */
         void handleFollow(const std::string &args, ChatTab *tab);