| commit | 710584b9daefe25a2b5dc2c6c10dbb00e1b3b451 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Fri Jan 27 09:23:21 2017 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Fri Jan 27 09:23:21 2017 +1100 |
| tree | 009861b1deb7839b99ca3c39de98e85b943da3f4 | |
| parent | c659af78eb7b7d7be40f23d9d97bde58eb1368ac [diff] | |
| parent | 83a1e53f392075e291a90746241dce45c6f9429a [diff] |
Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next