From 2707d48d9340d97f5036853d05c18d17e32ef3a8 Mon Sep 17 00:00:00 2001
From: martinkg <mgansser@online.de>
Date: May 08 2017 08:19:40 +0000
Subject: Merge branch 'master' into f24


---

diff --git a/.gitignore b/.gitignore
index c0aa947..142ecd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /vdr-plugin-epg2vdr-1.1.56.tar.bz2
 /vdr-plugin-epg2vdr-1.1.58.tar.bz2
 /vdr-plugin-epg2vdr-1.1.59.tar.bz2
+/vdr-plugin-epg2vdr-1.1.60.tar.bz2
diff --git a/sources b/sources
index faf3a71..3616ef3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-plugin-epg2vdr-1.1.59.tar.bz2) = 9810dbb331ed88e95a5e1b2dbdf59bf65a6a4401af88df5e95a27c092cb6720da38c731450c63e5f13d2ae62b27e6e2b0e2092d7520a9d6845bd067525c50556
+SHA512 (vdr-plugin-epg2vdr-1.1.60.tar.bz2) = 2d2d49c25fed0c19392e3d76c5158ef4980882b8ad9272e60a025989184be88116f12bf085375ddd9a87aa26b40847084f5e2f953bb5c52df00854428188510b
diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec
index 74ab46d..208ae32 100644
--- a/vdr-epg2vdr.spec
+++ b/vdr-epg2vdr.spec
@@ -1,5 +1,5 @@
 Name:           vdr-epg2vdr
-Version:        1.1.59
+Version:        1.1.60
 Release:        1%{?dist}
 Summary:        A plugin to retrieve EPG data from a mysql database into VDR
 
@@ -52,6 +52,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 
 %changelog
+* Mon May 08 2017 Martin Gansser <martinkg@fedoraproject.org> - 1.1.60-1
+- Update to 1.1.60
+
 * Sat May 06 2017 Martin Gansser <martinkg@fedoraproject.org> - 1.1.59-1
 - Update to 1.1.59