| commit | 09302fd19efbff9569eaad3f78ead8f411defd87 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Wed Oct 21 10:49:29 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Wed Oct 21 10:49:29 2015 +1100 |
| tree | ea7445250c19d8af6092eecb6908f1547dde86d6 | |
| parent | fbf98265891a672111dac8faabd190f62b678545 [diff] | |
| parent | 38416e53936ecf896948fdeffc36b76979117952 [diff] |
Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next