From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 4 Nov 2018 13:47:46 +0000 (+0100)
Subject: Merge branch 'next' into master
X-Git-Tag: 4.16.1~9
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=1847938d4eeba98260cc79ca45a11a134274c2ea

Merge branch 'next' into master
---

1847938d4eeba98260cc79ca45a11a134274c2ea
diff --cc debian/changelog
index 76fe1577,7695bb4c..35b3f9f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ i3-wm (4.15.1-1) unstable; urgency=medium
+ 
 -  * UNRELEASED
++  * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Sat, 10 Mar 2018 17:27:26 +0100
+ 
  i3-wm (4.15-1) unstable; urgency=medium
  
    * New upstream release.