From 903a16800594bff19ab570153f947353ca49e74b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 1 Nov 2013 11:19:19 -0300
Subject: Fold in changes

---
 CHANGELOG                            | 4 ++++
 changes/bug_support_provided_logfile | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 changes/bug_support_provided_logfile

diff --git a/CHANGELOG b/CHANGELOG
index bc9c679..65abb84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.1 Nov 1:
+  o Support user provided logfile option and default to bitmask.log
+    otherwise. Fixes #4153.
+
 0.3.0 Aug 23:
   o Use bitmask.log instead of leap_client.log. Closes #3424.
   o Update launcher icon, jumping guy -> rainbow mask.
diff --git a/changes/bug_support_provided_logfile b/changes/bug_support_provided_logfile
deleted file mode 100644
index 0a32ae4..0000000
--- a/changes/bug_support_provided_logfile
+++ /dev/null
@@ -1 +0,0 @@
-  o Support user provided logfile option and default to bitmask.log otherwise. Fixes #4153.
-- 
cgit v1.2.3