]> git.michaelhowe.org Git - packages/p/paho-mqtt.git/commit
Merge branch '1.1' v1.1
authorRoger A. Light <roger@atchoo.org>
Thu, 29 Jan 2015 22:45:58 +0000 (22:45 +0000)
committerRoger A. Light <roger@atchoo.org>
Thu, 29 Jan 2015 22:45:58 +0000 (22:45 +0000)
commit73b85d2427e196d6ad6b4efb432c714bb3dab543
tree16306ff3179411785be1a4f3d4d2e6c560621703
parenta3e8e69466d7da5b147bd07d14adc38013781509
parenta1605082fda56a48c9071c3a066ff41097e84c05
Merge branch '1.1'

Conflicts:
ChangeLog.txt

Change-Id: Ib629fe5533b132117e56c1624befd19a7909a575
ChangeLog.txt
src/paho/mqtt/client.py