# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1454159922 -3600
# Node ID ecebc821225dc8952c0f7a13724e66d066bf126f
# Parent  43328166dcf124f1b7e0cf39ca9141a05cc8e088# Parent  bd29742fa1baba5c3169efd7e2b38d685642a15c
Merge 0.10->trunk

diff -r 43328166dcf1 -r ecebc821225d CHANGES
--- a/CHANGES	Thu Jan 28 14:17:45 2016 +0100
+++ b/CHANGES	Sat Jan 30 14:18:42 2016 +0100
@@ -27,6 +27,7 @@
 -   mod\_carbons (XEP-0280)
 -   Asynchronous operations
 -   Pluggable connection timeout handling
+-   mod\_websocket (RFC 7395)
 
 Removed
 -------