[dmlite-plugins-mysql/el5: 5/5] Merge branch 'master' into el5

[Devresse]

commit 8a0208322473e16a98e0f96061bd2c833627213f
Merge: b3e518a e7b6e50
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Wed Mar 12 11:17:29 2014 +0100

    Merge branch 'master' into el5

 .gitignore                |    1 +
 dmlite-plugins-mysql.spec |   24 +++++++++++++++++++-----
 sources                   |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)
---