Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next

This commit is contained in:
James Morris 2015-06-03 19:10:29 +10:00
commit e6e29a4eae
5 changed files with 317 additions and 189 deletions