Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-09-25 02:45:48 -07:00
12 changed files with 289 additions and 41 deletions

View File

@@ -103,6 +103,8 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0249',
'sleekxmpp/plugins/xep_0258',
'sleekxmpp/plugins/xep_0279',
'sleekxmpp/plugins/xep_0280',
'sleekxmpp/plugins/xep_0297',
'sleekxmpp/features',
'sleekxmpp/features/feature_mechanisms',
'sleekxmpp/features/feature_mechanisms/stanza',