From 55faf27a8d0a6a1514b90539a1582ead4bed5418 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Apr 26 2014 08:33:38 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/audtty


Conflicts:
	audtty.spec

---

diff --git a/audtty.spec b/audtty.spec
index e821c8a..21e2ad8 100644
--- a/audtty.spec
+++ b/audtty.spec
@@ -1,6 +1,6 @@
 Name:           audtty
 Version:        0.1.12
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        A ncurses based terminal client for the Audacious
 
 License:        GPLv2+
@@ -45,9 +45,15 @@ install -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %changelog
-* Sat Apr 26 2014 Fabian Affolter <mail@fabian-affolter.ch> - 0.1.12-8
+* Sat Apr 26 2014 Fabian Affolter <mail@fabian-affolter.ch> - 0.1.12-10
 - Update spec file
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Jul 26 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 0.1.12-7
 - Fix F18 build by querying pkgconfig for glib2/dbus-glib cflags+libs
   (audtty-0.1.12-Makefile.patch).