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

[Rex Dieter]

commit 82712db6d83deef5c345b3bb761bc4487c370c6d
Merge: 35515ba 011102d
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:15:04 2015 -0600

    Merge branch 'master' into f20

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