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

[Rex Dieter]

commit 28c5079791e43278813327cc65f5e52b83349968
Merge: 4bae2e9 121e414
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:15:13 2015 -0600

    Merge branch 'master' into f20

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