Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 22 Feb 2016 02:27:12 +0000 (13:27 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 22 Feb 2016 02:27:12 +0000 (13:27 +1100)

Trivial merge