[git-bugzilla/el5: 10/10] Merge branch 'master' into el5

[Matej Cepl]

commit f6cfd89f0a92324e73ea36d8a0993cff2b1ec688
Merge: 2bacce7 5808cad
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed May 15 13:09:44 2013 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	git-bugzilla.spec

 0003-Attach-git-am-able-patches.patch |   26 ++++++++++++++++++++++++++
 git-bugzilla.spec                     |   15 ++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --cc git-bugzilla.spec
index 5050e02,27da63f..d62040a
--- a/git-bugzilla.spec
+++ b/git-bugzilla.spec
@@@ -50,6 -54,27 +54,15 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Wed May 15 2013 Matěj Cepl <mcepl at redhat.com> - 0-0.9.20091211git
+ - add Requires: perl(LWP::Protocol::https) (RHBZ# 960289)
+ 
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.8.20091211git
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.7.20091211git
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.6.20091211git
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.5.20091211git
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Wed Jul 28 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.4.20091211git
+ - Attach git-am -able patches
+ 
+ * Sun Feb 21 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.3.20091211git
+ - Require Crypt::SSLeay (Bruce Cowan, #559898)
+ 
  * Sat Dec 19 2009 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.2.20091211git
  - Add missing Require
  - Do not default to GNOME bugzilla