Merge branch 'smack-for-4.9' of http://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 15 Sep 2016 04:43:46 +0000 (14:43 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 15 Sep 2016 04:43:46 +0000 (14:43 +1000)
commita39f44faa8c7d84dff7d1fc0bc851c6499f94d7b
tree2d417042ad3aaddd7ad5639ecdc1a6e1245b02a5
parent8ccc7d6bad84bebf1f1a6364d1fa04d3d7b575f6
parentc60b906673eebb4f65840fa9dc204401caf276ea
Merge branch 'smack-for-4.9' of github.com/cschaufler/smack-next into next