From a1076da26f5100177f2310684bd7c37691000339 Mon Sep 17 00:00:00 2001
From: Ery Lee <ery.lee@gmail.com>
Date: Thu, 5 Mar 2015 14:56:09 +0800
Subject: [PATCH] v0.3.2-beta

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a0a60206..fcfbc2cb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 eMQTT ChangeLog
 ==================
 
+v0.3.2-beta (2015-03-05)
+------------------------
+
+Improve: merge emqttc serialiser, parser, packet
+
+Add: emqtt_opts to merge socket options
+
+
 v0.3.1-beta (2015-03-02)
 ------------------------