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

[Devresse]

commit b13bcf75093f7d4751bf2c88e4198189d5ffe380
Merge: 6b83113 80ee95a
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Tue Oct 7 08:49:02 2014 -0400

    Merge branch 'master' into f20

 .gitignore               |    1 +
 dmlite.spec              |   19 ++++-
 patch_memcache_fix.patch |  200 ++++++++++++++++++++++++++++++++++++++++++++++
 sources                  |    2 +-
 4 files changed, 217 insertions(+), 5 deletions(-)
---