Merge branch 'master' into next

Conflicts: debian/changelog
2012-01-27 19:56:58 +00:00 · 2012-01-27 19:56:58 +00:00 · cc2fda9242
parent c7ea8c42b6 536580fe73
commit cc2fda9242
1 changed files with 6 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -4,6 +4,12 @@ i3-wm (4.1.3-0) unstable; urgency=low

 -- 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