| commit | e6e29a4eae335059d2cc44ac543de7556ff7ac09 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Wed Jun 03 19:10:29 2015 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Wed Jun 03 19:10:29 2015 +1000 |
| tree | e09595fa1c5e5ac6c9eb1f92c86df1d0cfc62a9d | |
| parent | 8d94eb9b5cff350ba170848c862ca0006d33d496 [diff] | |
| parent | c0d77c884461fc0dec0411e49797dc3f3651c31b [diff] |
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next