[opendnssec/f20: 2/2] Merge branch 'master' into f20

[Paul Wouters]

commit 1cab02c4977138a4b84bc2b259a225069c6bc6c5
Merge: 512244e 389a5f5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Mar 29 17:39:43 2014 -0400

    Merge branch 'master' into f20

 opendnssec.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---