tree 8c2b25f98f6d413ee9039d20f322c3ff39817f2b
parent e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e
parent 3d04c92403d377918c9a3bddab6ee103f0db25dd
author James Morris <james.l.morris@oracle.com> 1439537710 +1000
committer James Morris <james.l.morris@oracle.com> 1439537710 +1000

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