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

[Simone Caronni]

commit 5b47522fecede4e999b9e8e57086a1e6f2f1f8eb
Merge: d4eb2a5 32c788a
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Feb 28 15:07:55 2014 +0100

    Merge branch 'el6' into el5

 ndo2db.init |  128 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 67 insertions(+), 61 deletions(-)
---