[lcgdm: 6/6] Merge branch 'el6'

[Alejandro Alvarez]

commit f9235ee4fa3844598a65269882bc755eff92e6b6
Merge: d3ed644 4d61a3d
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Mar 14 12:38:37 2014 +0100

    Merge branch 'el6'
    
    Conflicts:
    	lcgdm.spec

 lcgdm.spec |   46 ++++++++++++++++++++++++++++++++++++++++------
 sources    |    3 +--
 2 files changed, 41 insertions(+), 8 deletions(-)
---