Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 11 Aug 2015 01:18:53 +0000 (11:18 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 11 Aug 2015 01:18:53 +0000 (11:18 +1000)
commit5ab16579020edb79e215b401399f88c7e07fdaf9
tree5fdb2e49d543af7de6b129d6c87abb1967000a6b
parent459c15e53cf7e4e88a78ecfb109af5a267c5500a
parent41a2d5751616e38d1e293e3cb35a6e2bc7a03473
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next