Resolve conflict and reset automerge.
authorMark Michelson <mmichelson@digium.com>
Thu, 13 Dec 2012 16:39:40 +0000 (16:39 +0000)
committerMark Michelson <mmichelson@digium.com>
Thu, 13 Dec 2012 16:39:40 +0000 (16:39 +0000)
commitece4c957988c3926f679f805294072c31de59bda
tree18addab5cab2b5c8c7b1f120bf78c7114735ea63
parent7b5f4748fb368d81d588ae61a54d7a37c2f906ee
Resolve conflict and reset automerge.

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c
channels/sip/include/sip.h
configs/sip.conf.sample
configure
configure.ac
include/asterisk/autoconfig.h.in
main/taskprocessor.c
main/utils.c
res/res_calendar_exchange.c
res/res_clialiases.c