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

[Rex Dieter]

commit 174cc99e7ff04a170516ff5e0567cd24316d6cf5
Merge: 729e9ef 898db69
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:05:32 2014 -0600

    Merge branch 'master' into f20

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