Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)
commit09302fd19efbff9569eaad3f78ead8f411defd87
treeea7445250c19d8af6092eecb6908f1547dde86d6
parentfbf98265891a672111dac8faabd190f62b678545
parent38416e53936ecf896948fdeffc36b76979117952
Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next