]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 118b006 2905b90)
Merge remote-tracking branch 'upstream/master'
authorBen Homnick <bhomnick@gmail.com>
Wed, 7 Mar 2012 08:08:48 +0000 (16:08 +0800)
committerBen Homnick <bhomnick@gmail.com>
Wed, 7 Mar 2012 08:08:48 +0000 (16:08 +0800)
1  2 
src/ejabberd_c2s.erl patch | diff1 | diff2 | blob | history

diff --cc src/ejabberd_c2s.erl
Simple merge
Unnamed repository; edit this file 'description' to name the repository.