[ndoutils/epel7: 2/2] Merge branch 'master' into epel7

[Simone Caronni]

commit 3a5e2151b207b53708da537fe8923a0d33f2c828
Merge: 842d736 9cde8d3
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 18:39:56 2014 +0200

    Merge branch 'master' into epel7

 ndoutils.conf |    2 +-
 ndoutils.spec |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---