| commit | 4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Apr 02 11:03:58 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Apr 02 11:03:58 2015 +1100 |
| tree | 5d31fe2f0996b84eab1430f5ec5fa89fb71214e0 | |
| parent | 1018bc268864b20c1ae7b0bc5c5c396ee6d33fe3 [diff] | |
| parent | 18779b75e90e75bf7f1aee8e71307b69fa5f7631 [diff] |
Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next