From b0fd4045fdbfaddf4f1b1d50279f91b358acae91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Tue, 20 Aug 2013 17:06:43 +0200
Subject: [PATCH] Merge branch 'master' of
 ssh://pkgs.fedoraproject.org/community-mysql

Conflicts:
	community-mysql.spec
---
 community-mysql.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/community-mysql.spec b/community-mysql.spec
index b3c502b..61e88eb 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -1,6 +1,6 @@
 Name: community-mysql
 Version: 5.5.32
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -729,9 +729,12 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
-* Tue Jul 30 2013 Honza Horak <hhorak@redhat.com> 5.5.32-11
+* Tue Jul 30 2013 Honza Horak <hhorak@redhat.com> 5.5.32-12
 - Fix multilib header location for arm
 
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 5.5.32-11
+- Perl 5.18 rebuild
+
 * Fri Jul 26 2013 Honza Horak <hhorak@redhat.com> 5.5.32-10
 - Copy some generated files in order find-debuginfo.sh finds them
   Related: #729040