comparison src/core/xmpp.py @ 1982:e6b51b7ff31f

merged main branch
author Goffi <goffi@goffi.org>
date Tue, 28 Jun 2016 18:37:29 +0200
parents a2bc5089c2eb
children 046449cc2bff
comparison
equal deleted inserted replaced
1980:2a85c818751a 1982:e6b51b7ff31f