[rubygem-mixlib-shellout: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-mixlib-shellout

[Julian C. Dunn]

commit cccfc2b965367c1eccf04a357595b2088aded948
Merge: 5aa7ffa a110a42
Author: Julian C. Dunn <jdunn at aquezada.com>
Date:   Sun Sep 1 18:29:16 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-mixlib-shellout
    
    Conflicts:
    	rubygem-mixlib-shellout.spec

 rubygem-mixlib-shellout.spec |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --cc rubygem-mixlib-shellout.spec
index be35400,a615017..a896948
--- a/rubygem-mixlib-shellout.spec
+++ b/rubygem-mixlib-shellout.spec
@@@ -92,9 -100,15 +100,18 @@@ pop
  %doc %{gem_docdir}
  
  %changelog
 +* Sun Jul 21 2013 Julian C. Dunn <jdunn at aquezada.com> - 1.2.0-1
 +- Upgrade to 1.2.0
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Fri Mar 08 2013 Josef Stribny <jstribny at redhat.com> - 1.1.0-6
+ - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Dec 20 2012 Julian C. Dunn <jdunn at aquezada.com> - 1.1.0-4
  - make sure to BuildRequires ruby(rubygems) as well