[spice-html5/el6: 2/2] Merge branch 'master' into el6

[Jeremy White]

commit 1cdff4303df35be465203536830a343f92af08b0
Merge: cb55424 100980f
Author: Jeremy White <jwhite at codeweavers.com>
Date:   Fri Mar 13 14:06:54 2015 -0500

    Merge branch 'master' into el6

 .gitignore               |   1 +
 sources                  |   2 +-
 spice-html5-0.1.6.tar.gz | Bin 0 -> 82559 bytes
 spice-html5.spec         |  10 ++++++++--
 4 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc spice-html5.spec
index 0120ad8,3661832..7921335
--- a/spice-html5.spec
+++ b/spice-html5.spec
@@@ -34,8 -41,10 +41,7 @@@ file for Apache, but should work with a
  - If an agent is attached, enable dynamic resizing of the guest screen.
  - Add support for audio streams using the Opus encoding.
  - Vladik Romanovsky: Use wss scheme when accessing with https protocol
-   with any web server.
  
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
  * Thu Sep 19 2013 Jeremy White <jwhite at codeweavers.com> 0.1.4-1
  - Reduce memory leaks
  - Ack every message.