ejmr/php-mode — pull request #194 by jorissteyn (2014-10-27 19:01:13+00:00)
Title: Correct wrongly resolved merge conflict for "as" (was: #191)

Fix was merged in d117a47 but the test case for issue-178 still failed,
this commit makes all different uses for "as" behave properly.