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

[Michal Fojtik]

commit ea352d9866fef2120cf334950ebb2496c1ed9bc4
Merge: 55f3f27 cc52b6a
Author: Michal <mi at mifo.sk>
Date:   Wed Aug 15 12:09:24 2012 +0200

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

 rubygem-deltacloud-client.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rubygem-deltacloud-client.spec
index 90585d2,2d92ab5..da573fb
--- a/rubygem-deltacloud-client.spec
+++ b/rubygem-deltacloud-client.spec
@@@ -71,9 -71,9 +71,12 @@@ rm -rf %{buildroot
  %{gem_docdir}
  
  %changelog
 +* Wed Aug 15 2012 Michal Fojtik <mfojtik at redhat.com> - 1.0.0-1
 +- Version 1.0.0 bump
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Thu Apr 19 2012 Michal Fojtik <mfojtik at redhat.com> - 0.5.0-3
  - Fixed the install section