Merge branch 'master' into next

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 89608f77d17b9fb5c08a6282b01d9c55f2b2f139,397941c574e1e8ca426448220e961b7708685522..d144f0617de41724c01476c95648ae662981e185
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +i3-wm (4.1.3-0) unstable; urgency=low
 +
 +  * NOT YET RELEASED
 +
 + -- Michael Stapelberg <michael@stapelberg.de>  Fri, 27 Jan 2012 19:34:11 +0000
 +
+ i3-wm (4.1.2-2) unstable; urgency=low
+ 
+   * Rebuild against libyajl and libxcb from unstable
+ 
+  -- Michael Stapelberg <michael@stapelberg.de>  Fri, 27 Jan 2012 19:50:29 +0000
+ 
  i3-wm (4.1.2-1) unstable; urgency=low
  
    * Bugfix: Don’t lose focus on fullscreen windows when another window gets