[gfal2/f20: 5/5] Merge branch 'master' into f20

[Alejandro Alvarez]

commit 67c2760a104d7c239aab3fa772c79fba67f5447a
Merge: 0b3e389 03562c3
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Nov 7 10:41:38 2014 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	gfal2.spec

 gfal2-bad-string-fmt.patch       |   65 --------------------------------------
 gfal2-davix-httpcode.patch       |   17 ----------
 gfal2-gsiftp-session-reuse.patch |   14 --------
 gfal2.spec                       |   39 ++++++++++++----------
 sources                          |    2 +-
 5 files changed, 22 insertions(+), 115 deletions(-)
---
diff --cc gfal2.spec
index 5390b98,16d346a..195423a
--- a/gfal2.spec
+++ b/gfal2.spec
@@@ -289,15 -289,24 +289,18 @@@ make DESTDIR=%{buildroot} instal
  
  
  %changelog
+ * Fri Nov 07 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.7.6-1
+ - New upstream release
+ 
 -* Mon Sep 08 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-6
 -- Patch to use lseek64 instead of lseek in the http plugin
 -
 -* Thu Sep 04 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.8-5
 -- Rebuild for pugixml 1.4
 -
 -* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Mon Aug 11 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-3
 +* Mon Aug 11 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-4
  - Disable GridFTP session reuse by default (see LCGUTIL-448)
  
 -* Fri Aug 08 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-2
 +* Fri Aug 08 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-3
  - Patch for symbol that dissapeared in Davix
  
 +* Tue Jul 29 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-2
 +- Rebuilt for davix 0.3.4
 +
  * Mon Jul 28 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-1
  - Release 2.6.8 of GFAL2