[pdfposter: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pdfposter

[Fabian Affolter]

commit d1cdddb3be6486ae9a8c4d14e47c61b28fc962ee
Merge: 65082c0 cd01b0b
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Mar 2 10:56:27 2012 +0100

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

 pdfposter.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc pdfposter.spec
index 3252417,01d65ae..b7e4f9c
--- a/pdfposter.spec
+++ b/pdfposter.spec
@@@ -58,10 -58,13 +58,13 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 -* Sat Aug 13 2011 Fabian Affolter <fabian at bernewireless.net> - 0.5.0-8
 +* Sat Aug 13 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.5.0-8
  - Added missing file
  
 -* Fri Aug 12 2011 Fabian Affolter <fabian at bernewireless.net> - 0.5.0-7
 +* Fri Aug 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.5.0-7
  - Rebuild (pypdf)
  
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-6