tree ea7445250c19d8af6092eecb6908f1547dde86d6
parent fbf98265891a672111dac8faabd190f62b678545
parent 38416e53936ecf896948fdeffc36b76979117952
author James Morris <james.l.morris@oracle.com> 1445384969 +1100
committer James Morris <james.l.morris@oracle.com> 1445384969 +1100

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