Merged revisions 285527 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 8 Sep 2010 20:32:49 +0000 (20:32 +0000)
committerJason Parker <jparker@digium.com>
Wed, 8 Sep 2010 20:32:49 +0000 (20:32 +0000)
commitd077b0f081817909a8ec16292cfa83a6e4ada258
treebe05bcb9fecb1079688163fa5a98887fe691049d
parent1c12ca0407e7e94de05de3faf3ff6ff5a7977ba5
Merged revisions 285527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285527 | qwell | 2010-09-08 15:32:13 -0500 (Wed, 08 Sep 2010) | 15 lines

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

  ........
    r285526 | qwell | 2010-09-08 15:31:43 -0500 (Wed, 08 Sep 2010) | 8 lines

    Fixes issue where moh files were no longer rescanned during a reload.

    (closes issue #16744)
    Reported by: pj
    Patches:
          16744-reload.diff uploaded by qwell (license 4)
    Tested by: qwell
  ........
................

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