phalcon/zephir — pull request #399 by nkt (2014-05-14 12:03:06+00:00)
Title: Split files in config.m4 by \n

It's helps resolve conflicts