[krdc/f20: 3/3] Merge branch 'master' into f20

[Rex Dieter]

commit 1a9f0a3f32f75b02b24fee2338e5a50158095006
Merge: ed62ca1 cc8dd27
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:19:29 2015 -0600

    Merge branch 'master' into f20

 .gitignore | 2 ++
 krdc.spec  | 8 +++++++-
 sources    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---