| commit | cdac74ddf28e2f07319cc89446f9dea35d22d999 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Wed Jun 21 11:30:20 2017 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Wed Jun 21 11:30:20 2017 +1000 |
| tree | a834000d6eef03e194cc40a964191e583595b5b8 | |
| parent | e4b0852798bc15ed1a3ed6768ef2c4d2a1cb7599 [diff] | |
| parent | f28e783ff668cf5757182f6b00d488be37226bff [diff] |
Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next