Merge branch '1.1'

Conflicts:
	ChangeLog.txt

Change-Id: Ib629fe5533b132117e56c1624befd19a7909a575

diff --cc ChangeLog.txt
index 8db2050c8604886b5f23421287a278456d557b00,2af8bb331d6385fc4326163ad7977d586bdecef6..ac8deb0b208774364c45db8b2b41a95cd45cff43
--- 1/ChangeLog.txt
--- 2/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -1,10 -1,15 +1,18 @@@
- v1.0.3 - 2014-11-XX
- ===================
+ v1.1 - 2015-01-30
+ =================
  
+ - Add support for wildcard certificates. Closes #440547.
+ - Default connection behaviour has been reverted to MQTT v3.1 instead of
+   v3.1.1. There is as yet insufficient support for v3.1.1 to rely on, and
+   current v3.1 implementations do not return the correct CONNACK code to allow
+   detection of the fault. Closes #451735.
+ - Fix incorrect handling of queued messages after reconnecting. Closes
+   #452672.
 +- Fix possible race condition if the connection in loop_start() does not
 +  complete before loop_stop() is called, meaning the network thread never
 +  ends. Closes #448428. Thanks to Kees Bakker.
  
+ 
  v1.0.2 - 2014-09-13
  ===================
  

diff --cc src/paho/mqtt/client.py
Simple merge