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

[Rex Dieter]

commit ea15b22deda39c0995eb2c2e0257ecdc7777b085
Merge: 5c89313 666df06
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:18:58 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    1 +
 krfb.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---