[Auto Checking in outstanding changes in fax] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view
[Module package script: fax 2.10.0.3] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view
 * upstream changes
upstream bug fixes, restart updates for asterisk 1.8
[Auto Checking in outstanding changes in fax] assotred bug fixes
[Module package script: fax 2.10.0.4] assotred bug fixes
fax code cleanup; advanced setting wrtietimeout manager support; add port option to backups; closes #5871; #5823;
[Auto Checking in outstanding changes in fax]
[Module package script: fax 2.10.0.5]
re #5906 - php < 5.2 doesnt set filename
[Auto Checking in outstanding changes in fax] re #5906 - workaround for php < 5.2
[Module package script: fax 2.10.0.6] re #5906 - workaround for php < 5.2
Add Supported Tag
Merge commit '6c29339a59f345a6122acf7ec5cd8b53d8a21ce0' into release/2.10

* commit '6c29339a59f345a6122acf7ec5cd8b53d8a21ce0':
  [Module package script: fax 2.10.0.6] re #5906 - workaround for php < 5.2
  [Auto Checking in outstanding changes in fax] re #5906 - workaround for php < 5.2
  re #5906 - php < 5.2 doesnt set filename
  [Module package script: fax 2.10.0.5]
  [Auto Checking in outstanding changes in fax]
  fax code cleanup; advanced setting wrtietimeout manager support; add port option to backups; closes #5871; #5823;
  [Module package script: fax 2.10.0.4] assotred bug fixes
  [Auto Checking in outstanding changes in fax] assotred bug fixes
  upstream bug fixes, restart updates for asterisk 1.8
  * upstream changes
  [Module package script: fax 2.10.0.3] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view
  [Auto Checking in outstanding changes in fax] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view

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

* release/2.10:
  Add Supported Tag
  [Module package script: fax 2.10.0.6] re #5906 - workaround for php < 5.2
  [Auto Checking in outstanding changes in fax] re #5906 - workaround for php < 5.2
  re #5906 - php < 5.2 doesnt set filename
  [Module package script: fax 2.10.0.5]
  [Auto Checking in outstanding changes in fax]
  fax code cleanup; advanced setting wrtietimeout manager support; add port option to backups; closes #5871; #5823;
  [Module package script: fax 2.10.0.4] assotred bug fixes
  [Auto Checking in outstanding changes in fax] assotred bug fixes
  upstream bug fixes, restart updates for asterisk 1.8
  * upstream changes
  [Module package script: fax 2.10.0.3] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view
  [Auto Checking in outstanding changes in fax] re #5707 - allow posted values to show on page; minor costmetics towards moving to a proper view

Conflicts:
	bin/fax2mail.php
	functions.inc.php
	install.php
	module.xml