Merge in a few more changes. This time the include/ directory.
authorSean Bright <sean@malleable.com>
Thu, 7 Aug 2008 14:36:59 +0000 (14:36 +0000)
committerSean Bright <sean@malleable.com>
Thu, 7 Aug 2008 14:36:59 +0000 (14:36 +0000)
commit4fb07fb0c19774348225c5662dbfb20f1a278693
tree419a796207c7f997204aeec3bb3a0107eb803cce
parent4d0a4e7bfac6cb90ac6112a5f93a56ebaa719a7e
Merge in a few more changes.  This time the include/ directory.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/callerid.h
include/asterisk/strings.h