[novnc/epel7: 7/7] Merge branch 'master' (noVNC 0.5.1) into epel7

[Solly Ross]

commit 1f71677225ce218d8f7b1b0b3f5b528c2e0d392a
Merge: 270927c 170d583
Author: Solly Ross <sross at redhat.com>
Date:   Wed Feb 25 14:22:01 2015 -0500

    Merge branch 'master' (noVNC 0.5.1) into epel7
    
    This updates epel7 to use noVNC 0.5.1.

 .gitignore                      |  1 +
 novnc-0.4-call-websockify.patch | 25 -------------------------
 novnc.spec                      | 32 ++++++++++++++++++++++----------
 sources                         |  2 +-
 4 files changed, 24 insertions(+), 36 deletions(-)
---