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

[Rex Dieter]

commit 01de0316788c06eea880d98308143c610bfe195a
Merge: c170219 1286230
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:57:05 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |   16 +++++-----------
 kdnssd.spec |   31 +++++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 33 insertions(+), 16 deletions(-)
---