From b3d48cad3093904ce7c46291e728c545edbc7c53 Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga@tiscali.it>
Date: Aug 15 2013 06:54:35 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-partitionmanager


Conflicts:
	kde-partitionmanager.spec

---

diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec
index c3d1634..69a838f 100644
--- a/kde-partitionmanager.spec
+++ b/kde-partitionmanager.spec
@@ -3,7 +3,7 @@
 
 Name:           kde-partitionmanager
 Version:        1.0.3
-Release:        12.%{svn_date}svn%{?dist}
+Release:        13.%{svn_date}svn%{?dist}
 Summary:        KDE Partition Manager
 
 Group:          Applications/System
@@ -83,10 +83,13 @@ fi
 %{_kde4_datadir}/kde4/apps/partitionmanager
 
 %changelog
-* Thu Aug 15 2013 Mattia Verga <mattia.verga@tiscali.it> - 1.0.3-12.20130815svn
+* Thu Aug 15 2013 Mattia Verga <mattia.verga@tiscali.it> - 1.0.3-13.20130815svn
 - Upgrade to svn 2013-05-15 - adds support for decrypting LUKS volumes
 - Compress source with xz
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-12.20130624svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sun Jun 23 2013 Mattia Verga <mattia.verga@tiscali.it> - 1.0.3-11.20130624svn
 - Fix to enable udisks2 backend compatibility