Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-10-19 00:15:21 -07:00
8 changed files with 178 additions and 2 deletions

View File

@@ -103,6 +103,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0231',
'sleekxmpp/plugins/xep_0235',
'sleekxmpp/plugins/xep_0249',
'sleekxmpp/plugins/xep_0257',
'sleekxmpp/plugins/xep_0258',
'sleekxmpp/plugins/xep_0279',
'sleekxmpp/plugins/xep_0280',