From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 22 Apr 2011 13:35:59 +0000 (+0000)
Subject: Recorded merge of revisions 314776 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fda219a5e591701edad79d58561fae3fa6bf6b80;p=thirdparty%2Fasterisk.git

Recorded merge of revisions 314776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r314776 | russell | 2011-04-22 08:35:22 -0500 (Fri, 22 Apr 2011) | 10 lines

  Fix handling of some call parking config options.

  This patch adjusts the handling of some call parking config options to fix some
  issues that have already been addressed in 1.8 and trunk.

  (closes issue #19167)
  Reported by: bluecrow76
  Patches:
        asterisk-1.6.2.17.2-fix-build-parkinglot-parked-AST_FEATURE_FLAGS.diff uploaded by bluecrow76 (license 270)
........


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