]> granicus.if.org Git - ejabberd/commit
Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check...
authorBadlop <badlop@process-one.net>
Wed, 21 May 2014 16:45:28 +0000 (18:45 +0200)
committerBadlop <badlop@process-one.net>
Wed, 21 May 2014 16:45:28 +0000 (18:45 +0200)
commit735bd956591ad437bc49d01468753616ddf9c56c
treeafd767aa64379c91542be44af64c110171cdf275
parent69abb48c9006aba7a813be05b162dcf25f28a259
parentf6da708b02bfe147a2d9ae7bd18db2a0ee702ad9
Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check-packet-type

Conflicts:
src/ejabberd_c2s.erl
src/ejabberd_c2s.erl