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

[Ding-Yi Chen]

commit c70a197792dfc0d5499ae9d8e328f72986726ffc
Merge: d773cae 8b59e0f
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 30 11:06:39 2012 +1000

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-httplib2
    
    Conflicts:
    	python-httplib2.spec

 python-httplib2.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-httplib2.spec
index 414a380,c239002..1f53824
--- a/python-httplib2.spec
+++ b/python-httplib2.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name:           python-httplib2
  Version:        0.7.4
--Release:        5%{?dist}
++Release:        6%{?dist}
  Summary:        A comprehensive HTTP client library
  Group:          System Environment/Libraries
  License:        MIT
@@@ -91,10 -89,9 +91,13 @@@ rm -rf $RPM_BUILD_ROO
  %endif # with_python3
  
  %changelog
- * Fri Jul 27 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-5
++* Fri Jul 27 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-6
 +- Fixed Bug 840968 - SSL errors when the site certificate contains
 +  subjectAltName but DNS is not in it
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jun 22 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-4
  - Unify the spec file between EPEL and Fedora.