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

[Rex Dieter]

commit 05a24843056e5072d0c79a44f7ae0456f00a1e75
Merge: 44b7322 24b169d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:38:34 2015 -0600

    Merge branch 'master' into f20

 .gitignore          |    1 +
 kremotecontrol.spec |   11 +++++++----
 sources             |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---