Merged revisions 375470 via svnmerge from

Merged revisions 375470 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

........
  r375470 | jrose | 2012-10-30 09:42:29 -0500 (Tue, 30 Oct 2012) | 7 lines

  confbridge: Fix a bug which made conferences not record with AMI/CLI commands

  (closes issue ASTERISK-20601)
  Reported by: Vilius
  Patches:
      confbridge_mixmonitor.diff uploaded by Jonathan Rose (license 6182)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@375481 65c4cc65-6c06-0410-ace0-fbb531ad65f3