Merge branch 'next' into master

diff --cc debian/changelog
index aaa7e54e115a7425f3dba4197c16a19391e32b2c,1cb2e681cc178e6143f86020ec0f52f54eb0a127..8857ad013911938001434bbb158d42a933b2fe8d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
 -  * UNRELEASED
+ i3-wm (4.11.1-1) unstable; urgency=medium
+ 
++  * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Wed, 30 Sep 2015 09:03:26 +0200
+ 
  i3-wm (4.11-1) unstable; urgency=medium
  
    * New upstream release.

diff --cc src/commands.c
index 78dc2159e75221ed76451da9f7f38c1a02430379,0faf2775158889f49947f91d627fcd2118ebe899..c9580c28f2cd50a8523a18338f208f4209a5b3c9
--- 1/src/commands.c
--- 2/src/commands.c
+++ b/src/commands.c
@@@ -1180,8 -1151,23 +1151,26 @@@ void cmd_split(I3_CMD, const char *dire
              continue;
          }
  
+         DLOG("matching: %p / %s\n", current->con, current->con->name);
+         if (direction[0] == 't') {
+             layout_t current_layout;
+             if (current->con->type == CT_WORKSPACE) {
+                 current_layout = current->con->layout;
+             } else {
+                 current_layout = current->con->parent->layout;
+             }
+             /* toggling split orientation */
+             if (current_layout == L_SPLITH) {
+                 tree_split(current->con, VERT);
+             } else {
+                 tree_split(current->con, HORIZ);
+             }
+         } else {
+             tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
+         }
++
 +        DLOG("matching: %p / %s\n", current->con, current->con->name);
 +        tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
      }
  
      cmd_output->needs_tree_render = true;