[davix/el6: 3/3] Merge branch 'master' into el6

[Devresse]

commit a4b95295b49729f22ceb800de66a0ee7c292c671
Merge: 1a4fc50 839f130
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Mon Dec 8 06:18:51 2014 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 davix.spec |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---