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

[Rex Dieter]

commit efc278473ee0d49791d0eea75bc5e9808c0e5ae2
Merge: 1ab1ebb b9698ea
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:10:02 2014 -0600

    Merge branch 'master' into f20

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