From 77618d6a5eae4452b1477be87021558619afdb24 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Thu, 1 Jul 2010 19:22:45 +0000
Subject: [PATCH] Merge the 0.4.1 and 0.4.2 changelogs back into trunk

---
 Changelog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Changelog b/Changelog
index 987c0d5eb..37a3dbb16 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,16 @@
+Version 0.4.2:
+  Bugfixes:
+    * (Linux) Fixed a bug where Clementine wouldn't start at all on Slackware,
+      openSUSE, or any other distro without FTS3 support in sqlite.
+
+
+
+Version 0.4.1:
+  Bugfixes:
+    * (Mac) Fix global shortcuts issue.
+
+
+
 Version 0.4:
   Features:
     * Support for multiple, tabbed playlists.