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

[Simone Caronni]

commit 8e91743715c15655260cc4f612f2f032c67c32b2
Merge: da39625 6590acf
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 19:03:28 2014 +0200

    Merge branch 'master' into epel7

 ndoutils.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---