Fix phalcon/incubator#44

Conflicts:
	ext/logger/adapter/firephp.c
	ext/logger/formatter/firephp.c
Regenerated build/ files
Merge pull request #1330 from sjinks/1.2.4

[1.2.4] Backports of bug fixes from 1.3.0
Merge remote-tracking branch 'upstream/1.2.4' into 1.2.4

Conflicts:
	ext/logger/formatter/firephp.c