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

[Alejandro Alvarez]

commit 786ed68eebd42906558411c05355fd151d9cf456
Merge: bc49d8f f97b379
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Mon Jan 12 10:44:19 2015 +0100

    Merge branch 'master' into el5

 gfal2-local-copy-buffer2heap.patch |   31 ----
 gfal2-srm-patch-set-error.patch    |   15 --
 gfal2.spec                         |  271 +++++++++++++++++++-----------------
 sources                            |    2 +-
 4 files changed, 142 insertions(+), 177 deletions(-)
---