Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-07-30 09:08:58 -07:00
12 changed files with 135 additions and 15 deletions

View File

@@ -83,6 +83,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0115',
'sleekxmpp/plugins/xep_0118',
'sleekxmpp/plugins/xep_0128',
'sleekxmpp/plugins/xep_0131',
'sleekxmpp/plugins/xep_0153',
'sleekxmpp/plugins/xep_0172',
'sleekxmpp/plugins/xep_0184',