]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 177356 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 15:57:44 +0000 (15:57 +0000)
committerJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 15:57:44 +0000 (15:57 +0000)
commit1a446ca1000492260b6401a952627223deef20cc
tree0f78197e4c4d6430bac1654a855a0ad9cc0d1a80
parentf72d04de72c0f1fefe0cc85b92f5e1303aedc11c
Merged revisions 177356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177356 | jpeeler | 2009-02-19 09:56:31 -0600 (Thu, 19 Feb 2009) | 4 lines

  Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
  asterisk-dev mailing list. Thanks!
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/features.c