OSDN Git Service

Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 2 Apr 2015 00:03:58 +0000 (11:03 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 2 Apr 2015 00:03:58 +0000 (11:03 +1100)
commit4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57
tree5d31fe2f0996b84eab1430f5ec5fa89fb71214e0
parent1018bc268864b20c1ae7b0bc5c5c396ee6d33fe3
parent18779b75e90e75bf7f1aee8e71307b69fa5f7631
Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next