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

[Simone Caronni]

commit 842d7367ac1c0b8e094b30e92f5f1906eada7020
Merge: b01cbd5 fe201e5
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 08:55:51 2014 +0200

    Merge branch 'master' into epel7

 ndo2db.service |    4 ++--
 ndoutils.conf  |    1 +
 ndoutils.spec  |   31 +++++++++++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)
---