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

[Rex Dieter]

commit 576ea86b92fd00504201b6c87bdad1fe63c07e5a
Merge: 27155fe ecdc2a4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:55:19 2014 -0600

    Merge branch 'master' into f20

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