diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2012-02-20 17:29:18 +0200 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2012-02-20 17:29:18 +0200 |
| commit | 52df4fa024ac03061d4f47dd44f68a196ec13d13 (patch) | |
| tree | c43e606509bd81e6a8fa5f3da41b322d3c7be5d4 /src/cache_tab.erl | |
| parent | Improve session migration lock log message. (diff) | |
| parent | Fix typo in xep number, bosh is xep0206 (thanks to Ludovic Bocquet) (diff) | |
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.2.x
Conflicts:
src/configure
src/ejabberd.app
src/ejabberd_receiver.erl
src/tls/tls_drv.c
src/web/ejabberd_http.erl
Diffstat (limited to 'src/cache_tab.erl')
0 files changed, 0 insertions, 0 deletions