Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 21 Jun 2017 01:30:20 +0000 (11:30 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 21 Jun 2017 01:30:20 +0000 (11:30 +1000)
commitcdac74ddf28e2f07319cc89446f9dea35d22d999
treea834000d6eef03e194cc40a964191e583595b5b8
parente4b0852798bc15ed1a3ed6768ef2c4d2a1cb7599
parentf28e783ff668cf5757182f6b00d488be37226bff
Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next