From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 27 Jan 2012 19:56:58 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~110
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=cc2fda92422e29a61c929ffde8d3199305b89946

Merge branch 'master' into next

Conflicts:
	debian/changelog
---

cc2fda92422e29a61c929ffde8d3199305b89946
diff --cc debian/changelog
index 89608f77,397941c5..d144f061
--- a/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