2014-10-23 10:35:34---001

Change-Id: Iee627dd4de07152207ec200accf77bbcf43137e3
Signed-off-by: flygle <1341582089@qq.com>
Merge branch 'master' of https://github.com/flygle/xmpp.git

Signed-off-by: flygle <1341582089@qq.com>