[perl-Shipwright: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/perl-Shipwright

[cheeselee]

commit 667e9423944f4880767f945bcbbdb1a87039e7e7
Merge: f7697fc ec13f0d
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Sun Mar 4 16:31:38 2012 +0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/perl-Shipwright
    
    Conflicts:
    	perl-Shipwright.spec

 perl-Shipwright.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc perl-Shipwright.spec
index 7540235,78eebc9..dafd514
--- a/perl-Shipwright.spec
+++ b/perl-Shipwright.spec
@@@ -76,9 -76,9 +76,12 @@@ make test %{?_smp_mflags
  %{_mandir}/man3/*
  
  %changelog
 +* Sun Mar  4 2012 Robin Lee <cheeselee at fedoraproject.org> - 2.4.31-1
 +- Update to 2.4.31
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.30-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sat Sep 24 2011 Robin Lee <cheeselee at fedoraproject.org> - 2.4.30-1
  - Update to 2.4.30