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

[Rex Dieter]

commit 755fb28734f685a940bef079fae78291cd3f37dc
Merge: f36067f d5b0bfe
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:22:38 2015 -0600

    Merge branch 'master' into f20

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