Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
This commit is contained in:
Christopher Jones 2013-08-07 13:14:46 -07:00
commit ae4f8b2ab0
2 changed files with 2 additions and 2 deletions