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

[Rex Dieter]

commit 432a6bc22d13ed3da47650c9adb7ca34f648407d
Merge: bf34dd3 c3e8aac
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:29:49 2014 -0500

    Merge branch 'master' into f20

 .gitignore                       |    3 +-
 krfb-CVE-2014-4607.patch         | 8738 --------------------------------------
 krfb-unbundle_libvncserver.patch |   36 +-
 krfb.spec                        |   20 +-
 sources                          |    2 +-
 5 files changed, 35 insertions(+), 8764 deletions(-)
---