[Module Tag script: framework 12.0.1alpha36]
[Module Tag script: framework 2.11.0.29]
PearDB Support for mysqli and moving mysql*_insert_id() function into a pearDB wrapper
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  PearDB Support for mysqli and moving mysql*_insert_id() function into a pearDB wrapper
  [Module Tag script: framework 2.11.0.29]

Conflicts:
	amp_conf/htdocs/admin/assets/js/pbxlib.js
Merge branch 'release/12.0' into develop

* release/12.0:
  PearDB Support for mysqli and moving mysql*_insert_id() function into a pearDB wrapper
  [Module Tag script: framework 2.11.0.29]
  [Module Tag script: framework 12.0.1alpha36]