- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
Merge branch 'PHP-5.5'

* PHP-5.5:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock