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

[Alejandro Alvarez]

commit 6773dad9cce31f60c1be5443d7d34882fd885aa9
Merge: 227b0f9 dcbc297
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Thu Oct 16 15:12:42 2014 +0200

    Merge branch 'master' into epel7

 lcgdm-dpm-listspaces-dav.patch |   13 +++++++++++++
 lcgdm.spec                     |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---