Merged revisions 331138 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:51:38 +0000 (15:51 +0000)
committerJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:51:38 +0000 (15:51 +0000)
commit19c8278815c19785925d58d357b3e84c5a1ed979
treed854ca67964927b93b4c8e3f7e0cac38721a24b7
parent16acfefa74f3f2d2ec5cfc33b9b21b5d5648ba3f
Merged revisions 331138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line

  Revert merge of r306999, due to merge conflict.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/asterisk.conf.sample
configs/voicemail.conf.sample
doc/asterisk.8
doc/asterisk.sgml