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

[Rex Dieter]

commit d8abb6992348ea21f5bb3865e71873baa6a49ae7
Merge: 01de031 d39ca15
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:34:07 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    1 +
 kdnssd.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---