tree 0fe979dc49a794ae50af585062e75ebcf8427900
parent 37babe4ec610ff288a60aa79619b3d2f00bcfd89
parent 81bd0d56298f93af6ac233d8a7e8b29aa4b094b7
author James Morris <james.l.morris@oracle.com> 1451106673 +1100
committer James Morris <james.l.morris@oracle.com> 1451106673 +1100

Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next