| commit | aa98b942cbf305cf2abe5dc3aff11f579c7d7fdc | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sat Dec 26 16:11:13 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Sat Dec 26 16:11:13 2015 +1100 |
| tree | 0fe979dc49a794ae50af585062e75ebcf8427900 | |
| parent | 37babe4ec610ff288a60aa79619b3d2f00bcfd89 [diff] | |
| parent | 81bd0d56298f93af6ac233d8a7e8b29aa4b094b7 [diff] |
Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next