| commit | d6f7aa27f41db6f556dba0185228a0b90a2a0980 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sat Jun 13 09:51:16 2015 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Sat Jun 13 09:51:16 2015 +1000 |
| tree | bdd9e255ba89d0def8690f383bc2b4be62ccbc80 | |
| parent | 9fc2b4b436cff7d8403034676014f1be9d534942 [diff] | |
| parent | 5430209497eeb01415c681aaac0d00f65d24a526 [diff] |
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next