Merged revisions 285530 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 8 Sep 2010 20:43:38 +0000 (20:43 +0000)
committerJason Parker <jparker@digium.com>
Wed, 8 Sep 2010 20:43:38 +0000 (20:43 +0000)
commitef247c398fa2f5e85ed909b32fe36aa80d94fa66
tree4e8ac47c071258c1fcae51d95016a7c1c742eb24
parentd077b0f081817909a8ec16292cfa83a6e4ada258
Merged revisions 285530 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285530 | qwell | 2010-09-08 15:43:10 -0500 (Wed, 08 Sep 2010) | 9 lines

  Merged revisions 285529 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r285529 | qwell | 2010-09-08 15:42:44 -0500 (Wed, 08 Sep 2010) | 1 line

    Follow coding guidelines in moh rescan fix.  Also fix the documentation that got me in trouble.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/astobj2.h
res/res_musiconhold.c