Merged revisions 329257 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 21 Jul 2011 20:26:44 +0000 (20:26 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 21 Jul 2011 20:26:44 +0000 (20:26 +0000)
commitf243d129c960ef6ffbf17a7eba0995c5b72c3407
tree55a526cafd0665f14ae12a587ccc2466238a6265
parent54f92a68c78def1c6c2694f05a7cfd13f00118df
Merged revisions 329257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329257 | russell | 2011-07-21 15:22:36 -0500 (Thu, 21 Jul 2011) | 2 lines

  s/1.10/10.0/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
channels/chan_dahdi.c
channels/sig_pri.c
include/asterisk/netsock2.h
include/asterisk/rtp_engine.h
main/features.c