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

[Devresse]

commit bf4dbef9a665ac41383b8601f63f4b3a3409679b
Merge: bd65a23 424a91b
Author: Adrien Devresse <adevress at adevvm-sl6-1.cern.ch>
Date:   Fri Dec 20 12:04:51 2013 +0100

    Merge branch 'master' into el6

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