| commit | 5ab16579020edb79e215b401399f88c7e07fdaf9 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Tue Aug 11 11:18:53 2015 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Tue Aug 11 11:18:53 2015 +1000 |
| tree | 5fdb2e49d543af7de6b129d6c87abb1967000a6b | |
| parent | 459c15e53cf7e4e88a78ecfb109af5a267c5500a [diff] | |
| parent | 41a2d5751616e38d1e293e3cb35a6e2bc7a03473 [diff] |
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next