# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1484328618 -3600
# Node ID 4caaa0c185f1d62e951df04da2c404936e7e34b9
# Parent  8a994208606853ad3aac54344b78c3652ead38d8# Parent  0dea440bdd4643e9908a86fbb46a16987d0eeaec
Merge 0.10->trunk

diff -r 8a9942086068 -r 4caaa0c185f1 CHANGES
--- a/CHANGES	Mon Jan 09 10:17:39 2017 +0100
+++ b/CHANGES	Fri Jan 13 18:30:18 2017 +0100
@@ -35,4 +35,5 @@
 -------
 
 -   mod\_privacy (XEP-0016)
+-   mod\_compression (XEP-0138)