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

[Simone Caronni]

commit da396254b1d976000714feb981a61638c5160a0d
Merge: 3a5e215 3c32c7a
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 18:51:47 2014 +0200

    Merge branch 'master' into epel7

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