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

[Fabian Affolter]

commit 73f5e6699cdb65795d7efc6837cc6592a2fa5e2d
Merge: dd9b253 12e453e
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Jun 14 21:21:33 2012 +0200

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

 mr.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc mr.spec
index 0c10df2,661c61b..fa2a629
--- a/mr.spec
+++ b/mr.spec
@@@ -57,9 -57,9 +57,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Thu Jun 14 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.12-1
 +- Updated to new upstream version 1.12
 +
+ * Fri Jun 08 2012 Petr Pisar <ppisar at redhat.com> - 1.11-2
+ - Perl 5.16 rebuild
+ 
  * Thu Apr 05 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.11-1
  - Updated to new upstream version 1.11