Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next...
authorJames Morris <james.l.morris@oracle.com>
Wed, 3 Jun 2015 09:10:29 +0000 (19:10 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 3 Jun 2015 09:10:29 +0000 (19:10 +1000)

Trivial merge