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

[Rex Dieter]

commit d7ca2d78049c53389600cd0abd0c1902ae85a4b9
Merge: 57351f2 814a0f6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:11:49 2014 -0500

    Merge branch 'master' into f20

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