]> granicus.if.org Git - ejabberd/commit
Merge branch 'caps' into 2.1.x
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Wed, 24 Nov 2010 07:45:05 +0000 (16:45 +0900)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Wed, 24 Nov 2010 07:45:05 +0000 (16:45 +0900)
commitb8d6aee1ce228f397ac2f913b3b7f824b6c4f562
tree1cb6337e410c160004c96e2a7fef06d0b101d8e6
parent48b768b5b09e564a06ca349e115b829ce9239950
parent36df8c9035a32cf5f6028a0421a248452eb927c7
Merge branch 'caps' into 2.1.x

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