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)

Trivial merge