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

[Devresse]

commit 1812cc7aadcf2e8852ff358b99a8ca1da07979a3
Merge: 114ceee 5663312
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Tue Nov 18 11:37:39 2014 -0500

    Merge branch 'master' into el6

 .gitignore  |    1 +
 dmlite.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---