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

[Rex Dieter]

commit 04f09c4271604b3bbde135b71380b1af50705c58
Merge: d7ca2d7 364f885
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:43:52 2014 -0500

    Merge branch 'master' into f20

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