[lcgdm/f19: 7/7] Merge branch 'master' into f19

[Alejandro Alvarez]

commit fbc0c635e2e183fcf5bd5f294cd926850b222f19
Merge: 5404bf7 f9235ee
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Mar 14 14:18:13 2014 +0100

    Merge branch 'master' into f19

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