| commit | a39f44faa8c7d84dff7d1fc0bc851c6499f94d7b | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Sep 15 14:43:46 2016 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Sep 15 14:43:46 2016 +1000 |
| tree | 2d417042ad3aaddd7ad5639ecdc1a6e1245b02a5 | |
| parent | 8ccc7d6bad84bebf1f1a6364d1fa04d3d7b575f6 [diff] | |
| parent | c60b906673eebb4f65840fa9dc204401caf276ea [diff] |
Merge branch 'smack-for-4.9' of http://github.com/cschaufler/smack-next into next