Merged revisions 67594 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 12:21:33 +0000 (12:21 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 12:21:33 +0000 (12:21 +0000)
commit3f671bb11db0229a5d128d6b6fc5e309225ff579
treeb582076f60557220987af52e192453281f18dfde
parent1d8be33e285dce0f061c0b6ba324365a887b2c07
Merged revisions 67594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r67594 | file | 2007-06-06 08:20:27 -0400 (Wed, 06 Jun 2007) | 10 lines

Merged revisions 67593 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r67593 | file | 2007-06-06 08:18:36 -0400 (Wed, 06 Jun 2007) | 2 lines

Revert channel name splitting fix for Zap. The moral of the story is don't use - in your user/peer names. (issue #9668 reported by stevedavies)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/devicestate.c