[pdfshuffler: 7/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfshuffler

[Fabian Affolter]

commit 8073f78fbd320025ef5b0c39c4b646ac36fb75ac
Merge: d64a441 71a5d84
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Jun 27 21:53:34 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfshuffler
    
    Conflicts:
    	pdfshuffler.spec

 pdfshuffler.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc pdfshuffler.spec
index 30d8da0,910c99d..8a48adb
--- a/pdfshuffler.spec
+++ b/pdfshuffler.spec
@@@ -47,11 -69,14 +47,17 @@@ desktop-file-validate %{buildroot}/%{_d
  %{python_sitelib}/%{name}*.egg-info
  %{python_sitelib}/%{name}/
  
 -
  %changelog
 +* Wed Jun 26 2013 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.0-1
 +- Spec file cleaned
 +- Switch to release package
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-0.4.20120302svn64
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-0.3.20120302svn64
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Feb 02 2012 Fabian Affolter <mail at fabian-affolter.ch>  - 0.6.0-0.2.20120302svn64
  - Minor changes