[perl-Imager/f14: 9/9] Merge remote-tracking branch 'origin/f15' into f14

[corsepiu]

commit 64d8ca4cda962830d8e0e1aec42783d22e805d1a
Merge: 192efd1 810f802
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue May 24 04:54:58 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14
    
    Conflicts:
    	.gitignore
    	perl-Imager.spec
    	sources

 .gitignore       |    5 +----
 perl-Imager.spec |    6 ++++--
 sources          |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --cc perl-Imager.spec
index b55bb26,56630d3..d1fc88a
--- a/perl-Imager.spec
+++ b/perl-Imager.spec
@@@ -71,8 -71,20 +71,10 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
- * Fri Jan 21 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.80-1
+ * Sun May 22 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.83-1
  - Upstream update.
+ 
 -* Wed Mar 30 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.82-1
 -- Upstream update.
 -
 -* Fri Feb 18 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.81-1
 -- Upstream update.
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.80-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Fri Jan 21 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.80-1
 -- Upstream update.
  - BR: giflib-devel instead of libungif-devel.
  - spec file massage.
  - Add perl_default_filter.