[dmlite-plugins-s3/el6: 7/7] Merge branch 'master' into el6

[Devresse]

commit e54192e9af41c392b0c65ff6b27e6f0380839e8b
Merge: d5cfd07 9cd7f24
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Wed Mar 12 16:03:11 2014 +0100

    Merge branch 'master' into el6

 dmlite-plugins-s3.spec |   18 ++++++++++++++++--
 sources                |    2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)
---