Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)
commit0e38c35815f50e5a347977d76fb5eb4c3bf020b5
tree8c2b25f98f6d413ee9039d20f322c3ff39817f2b
parente4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e
parent3d04c92403d377918c9a3bddab6ee103f0db25dd
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next