Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-07-16 20:13:35 -07:00
53 changed files with 455 additions and 55 deletions

View File

@@ -86,6 +86,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0172',
'sleekxmpp/plugins/xep_0184',
'sleekxmpp/plugins/xep_0186',
'sleekxmpp/plugins/xep_0191',
'sleekxmpp/plugins/xep_0198',
'sleekxmpp/plugins/xep_0199',
'sleekxmpp/plugins/xep_0202',