| commit | 602094428090ea17321afcb5edc572544b7ee368 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Mon Feb 22 13:27:12 2016 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Mon Feb 22 13:27:12 2016 +1100 |
| tree | 8e4a100bd104851c1ec96b58f0be022fae87fdfa | |
| parent | 99cda8cb4639de81cde785b5bab9bc52e916e594 [diff] | |
| parent | 8012495e177bbf67eba8915e266a6f897bedbd53 [diff] |
Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next