[dmlite/el5: 3/3] Merge branch 'master' into el5

[Alejandro Alvarez]

commit 63b915d16b781e753bda81428b38d8d0f48240c6
Merge: cf3ed4a 189c64e
Author: aalvarez <aalvarez at cern.ch>
Date:   Mon Apr 28 10:05:17 2014 +0200

    Merge branch 'master' into el5

 dmlite-validateToken.patch |   13 +++++++++++++
 dmlite.spec                |    9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---