commit f71ea3ee8e000a8c35acbcf4f93dce3576554ec5 Merge: d83f12d 6e5b915 Author: Adrien Devresse <adrien.devresse at cern.ch> Date: Wed Apr 25 16:47:09 2012 +0200 Merge branch 'master' into el5 .gitignore | 1 + gfal.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---