tree e09595fa1c5e5ac6c9eb1f92c86df1d0cfc62a9d
parent 8d94eb9b5cff350ba170848c862ca0006d33d496
parent c0d77c884461fc0dec0411e49797dc3f3651c31b
author James Morris <james.l.morris@oracle.com> 1433322629 +1000
committer James Morris <james.l.morris@oracle.com> 1433322629 +1000

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