Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2013-01-04 03:00:43 -08:00
7 changed files with 164 additions and 4 deletions

View File

@@ -67,6 +67,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0030/stanza',
'sleekxmpp/plugins/xep_0033',
'sleekxmpp/plugins/xep_0047',
'sleekxmpp/plugins/xep_0048',
'sleekxmpp/plugins/xep_0049',
'sleekxmpp/plugins/xep_0050',
'sleekxmpp/plugins/xep_0054',