Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next...
authorJames Morris <james.l.morris@oracle.com>
Wed, 3 Jun 2015 09:10:29 +0000 (19:10 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 3 Jun 2015 09:10:29 +0000 (19:10 +1000)
commite6e29a4eae335059d2cc44ac543de7556ff7ac09
treee09595fa1c5e5ac6c9eb1f92c86df1d0cfc62a9d
parent8d94eb9b5cff350ba170848c862ca0006d33d496
parentc0d77c884461fc0dec0411e49797dc3f3651c31b
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next