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

[Alejandro Alvarez]

commit 193c394a468605e14dc80238f1cc71cfa1236b3b
Merge: 09450d7 189c64e
Author: aalvarez <aalvarez at cern.ch>
Date:   Mon Apr 28 08:44:37 2014 +0200

    Merge branch 'master' into f20

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