[sr-dev] git:master:2cb8eb74: Merge branch 'master' into uacregstat

[Olle E. Johansson]

Module: kamailio
Branch: master
Commit: 2cb8eb748e12bdf6799ac567ab6bf778cfd2c36b
URL: https://github.com/kamailio/kamailio/commit/2cb8eb748e12bdf6799ac567ab6bf778cfd2c36b

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date: 2015-02-25T09:14:52+01:00

Merge branch 'master' into uacregstat

* master:
  mem Remove SVN ID, remove history
  kazoo - fix compilation
  kazoo - fix timer interval
  userblacklist remove svn ID
  modules/sipt: fix size check for optional pointer
  modules/sipt: fix size check for optional pointer

---

Modified: mem/f_malloc.c
Modified: mem/f_malloc.h
Modified: mem/ll_malloc.c
Modified: mem/ll_malloc.h
Modified: mem/mem.c
Modified: mem/mem.h
Modified: mem/memdbg.h
Modified: mem/meminfo.h
Modified: mem/memtest.c
Modified: mem/q_malloc.c
Modified: mem/q_malloc.h
Modified: mem/sf_malloc.c
Modified: mem/sf_malloc.h
Modified: mem/shm_mem.c
Modified: mem/shm_mem.h
Modified: mem/src_loc.h
Modified: modules/kazoo/kazoo.c
Modified: modules/kazoo/kz_amqp.c
Modified: modules/sipt/ss7_parser.c
Modified: modules/userblacklist/db.c
Modified: modules/userblacklist/db.h
Modified: modules/userblacklist/db_userblacklist.c
Modified: modules/userblacklist/db_userblacklist.h
Modified: modules/userblacklist/userblacklist.c

---

Diff:  https://github.com/kamailio/kamailio/commit/2cb8eb748e12bdf6799ac567ab6bf778cfd2c36b.diff
Patch: https://github.com/kamailio/kamailio/commit/2cb8eb748e12bdf6799ac567ab6bf778cfd2c36b.patch