From 97349f85c32ea115c3b041cf81ceaae580069531 Mon Sep 17 00:00:00 2001
From: Germano Massullo <germano.massullo@gmail.com>
Date: Nov 06 2015 13:54:27 +0000
Subject: Merge branch 'master' into f23


---

diff --git a/darktable.spec b/darktable.spec
index 1fb01ba..8e11be0 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -134,8 +134,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/man/man1/darktable-cli.1.gz
 
 %changelog
-
-=======
 * Fri Nov 06 2015 Germano Massullo <germano.massullo@gmail.com> - 1.6.9-3
 - Removed x86 32 bit CPU support