From 6b88e29e7147489c82e7d6d1298bc1d6b0f1b55f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 6 Sep 2014 13:41:27 +0200
Subject: [PATCH] Document changes and release 0.6.18

Conflicts:
	debian/changelog
---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f6ba577..b73138f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,15 @@ git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
   * rpm packaging: use macro for python binary
 
  -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 28 Aug 2014 11:40:05 +0300
+git-buildpackage (0.6.18) unstable; urgency=medium
+
+  * Upload to unstable
+  * [6edd836] Don't delete *_source.changes on source only builds
+    (Closes: #758726)
+  * [a37832e] Mention --no-merge (Closes: #760091)
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 06 Sep 2014 13:41:05 +0200
+
 git-buildpackage (0.6.17) experimental; urgency=medium
 
   [ Guido Günther ]
-- 
2.7.4