[gfal2/el6: 2/2] Merge branch 'master' into el6

[Devresse]

commit da5cadeec06a1855977f68479bce747582b2e85c
Merge: d33814c be35cdc
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Wed Feb 26 17:53:30 2014 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 gfal2.spec |    6 +++---
 sources    |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --cc gfal2.spec
index 6f225f4,ac0d5fd..16129c6
--- a/gfal2.spec
+++ b/gfal2.spec
@@@ -2,9 -2,9 +2,9 @@@
  %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
  
  Name:				gfal2
- Version:			2.4.8
+ Version:			2.5.5
  # https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
 -Release:			1%{?dist}
 +Release:			2%{?dist}
  Summary:			Grid file access library 2.0
  Group:				Applications/Internet
  License:			ASL 2.0