[ndjbdns/epel7: 5/5] Merge branch 'master' into epel7

[Simone Caronni]

commit 224eac0968c825b13a1fe821cb66a24cc1cef62e
Merge: f662704 b83cd8b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Apr 16 13:32:43 2014 +0200

    Merge branch 'master' into epel7

 .gitignore   |    1 +
 ndjbdns.spec |   14 ++++++++++----
 sources      |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---