Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)

Trivial merge