[ndoutils/el5: 3/3] Merge branch 'el6' into el5

[Simone Caronni]

commit 326d83b625d0e81411041c3aaa2a320c0a99ceda
Merge: 5b47522 16f48ff
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 09:13:35 2014 +0200

    Merge branch 'el6' into el5

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