Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next...
authorJames Morris <james.l.morris@oracle.com>
Fri, 12 Jun 2015 23:51:16 +0000 (09:51 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 12 Jun 2015 23:51:16 +0000 (09:51 +1000)
commitd6f7aa27f41db6f556dba0185228a0b90a2a0980
treebdd9e255ba89d0def8690f383bc2b4be62ccbc80
parent9fc2b4b436cff7d8403034676014f1be9d534942
parent5430209497eeb01415c681aaac0d00f65d24a526
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next