[lcgdm/f20: 11/11] Merge branch 'f21' into f20

[Alejandro Alvarez]

commit 22caa71654437effd6147af285347131b1e296df
Merge: 57bfa72 35764a2
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Wed Sep 24 08:42:59 2014 +0200

    Merge branch 'f21' into f20

 lcgdm.spec |   27 ++++++++++++++++-----------
 sources    |    2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)
---