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

[Alejandro Alvarez]

commit 1368bb99aaecf6eca7c426bdb3025d91cfcb2942
Merge: 57cefd4 e2649e7
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Mon Dec 15 11:46:19 2014 +0100

    Merge branch 'master' into epel7

 gfal2-local-copy-buffer2heap.patch |   31 +++++++++++++++++++++++++++++++
 gfal2.spec                         |    8 +++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---