fixes #5568 tooltip incorrect
[Auto Checking in outstanding changes in ivr]
[Module package script: ivr 2.10.0.6]
fixes #5665 don't try to access queue functions if they are not there
[Module package script: ivr 2.10.0.6]
 * upstream changes
Merged revisions 13994 via svnmerge from 
http://www.freepbx.org/v2/svn/modules/branches/2.11

........
  r13994 | p_lindheimer | 2012-04-24 10:38:08 -0700 (Tue, 24 Apr 2012) | 1 line
  
  fixes #5788 allow use of remote DB for CDR Reports
........
reverting code checked in in error from r13995
[Auto Checking in outstanding changes in ivr]
[Module package script: ivr 2.10.0.7]
fixes #5854, reverting r14115 checked in error
[Module package script: ivr 2.10.0.8]
fixes #5882 always put the return extenion in the IVRs as it is used as a destination from sub IVR or Announcements
[Auto Checking in outstanding changes in ivr]
[Module package script: ivr 2.10.0.9]
Add Supported Tag
FREEPBX-6145 #resolve - correct query to properly display ivr recording usage
Merge commit 'eddcc7671145ec25df89cc1b9fddf5645d77c3bb' into release/2.10

* commit 'eddcc7671145ec25df89cc1b9fddf5645d77c3bb':
  [Module package script: ivr 2.10.0.9]
  [Auto Checking in outstanding changes in ivr]
  fixes #5882 always put the return extenion in the IVRs as it is used as a destination from sub IVR or Announcements
  [Module package script: ivr 2.10.0.8]
  fixes #5854, reverting r14115 checked in error
  [Module package script: ivr 2.10.0.7]
  [Auto Checking in outstanding changes in ivr]
  reverting code checked in in error from r13995
  Merged revisions 13994 via svnmerge from http://www.freepbx.org/v2/svn/modules/branches/2.11
  * upstream changes
  [Module package script: ivr 2.10.0.6]
  fixes #5665 don't try to access queue functions if they are not there
  [Module package script: ivr 2.10.0.6]
  [Auto Checking in outstanding changes in ivr]
  fixes #5568 tooltip incorrect

Conflicts:
	module.xml
Merge branch 'release/2.10' into release/2.11

* release/2.10:
  Add Supported Tag
  [Module package script: ivr 2.10.0.9]
  [Auto Checking in outstanding changes in ivr]
  fixes #5882 always put the return extenion in the IVRs as it is used as a destination from sub IVR or Announcements
  [Module package script: ivr 2.10.0.8]
  fixes #5854, reverting r14115 checked in error
  [Module package script: ivr 2.10.0.7]
  [Auto Checking in outstanding changes in ivr]
  reverting code checked in in error from r13995
  Merged revisions 13994 via svnmerge from http://www.freepbx.org/v2/svn/modules/branches/2.11
  * upstream changes
  [Module package script: ivr 2.10.0.6]
  fixes #5665 don't try to access queue functions if they are not there
  [Module package script: ivr 2.10.0.6]
  [Auto Checking in outstanding changes in ivr]
  fixes #5568 tooltip incorrect

Conflicts:
	functions.inc.php
	module.xml
Merge branch 'release/2.11'

* release/2.11:
  FREEPBX-6145 #resolve - correct query to properly display ivr recording usage
  Add Supported Tag
  [Module package script: ivr 2.10.0.9]
  [Auto Checking in outstanding changes in ivr]
  fixes #5882 always put the return extenion in the IVRs as it is used as a destination from sub IVR or Announcements
  [Module package script: ivr 2.10.0.8]
  fixes #5854, reverting r14115 checked in error
  [Module package script: ivr 2.10.0.7]
  [Auto Checking in outstanding changes in ivr]
  reverting code checked in in error from r13995
  Merged revisions 13994 via svnmerge from http://www.freepbx.org/v2/svn/modules/branches/2.11
  * upstream changes
  [Module package script: ivr 2.10.0.6]
  fixes #5665 don't try to access queue functions if they are not there
  [Module package script: ivr 2.10.0.6]
  [Auto Checking in outstanding changes in ivr]
  fixes #5568 tooltip incorrect