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

[Rex Dieter]

commit c2108951b78c628952dd943c0532f15558208706
Merge: 05a2484 c6ba675
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:19:40 2015 -0600

    Merge branch 'master' into f20

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