Commit Graph

3 Commits

Author SHA1 Message Date
Xinchen Hui
0b28ef4f55 Merge branch 'master' into php7
Conflicts:
	.travis.yml
	travis/compile.sh
2015-10-26 20:56:19 -07:00
Xinchen Hui
d3323aa9fe enable travis 2015-10-26 20:54:55 -07:00
Helmut Januschka
061f22aac0 fix for latest php7 head 2015-02-02 13:27:33 +00:00