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

[Rex Dieter]

commit dfdba894dd4f9184af78351948c915bd31a63979
Merge: 95733f9 52ffc42
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:11:04 2014 -0500

    Merge branch 'master' into f20

 .gitignore          |    6 ++++++
 kremotecontrol.spec |   23 ++++++++++++++++++++++-
 sources             |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---