[dmlite-plugins-memcache/el5: 8/8] Merge branch 'master' into el5

[Devresse]

commit 21ccc70725d2779f3197cdea3e8c198ffe78315b
Merge: 2a26868 5aee76f
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Wed Mar 12 15:57:51 2014 +0100

    Merge branch 'master' into el5

 .gitignore                   |    1 +
 dmlite-plugins-memcache.spec |   36 ++++++++++++++++++++++++++++++------
 sources                      |    2 +-
 3 files changed, 32 insertions(+), 7 deletions(-)
---