Merge branch 'PHP-5.5' into PHP-5.6

Tyrael · Tyrael · commit ac54df17df8a · 2015-02-10T10:36:25.000+01:00
* PHP-5.5:
  add make install

Conflicts:
	travis/compile.sh
diff --git a/travis/compile.sh b/travis/compile.sh
@@ -57,4 +57,5 @@ $TS \
 --with-enchant=/usr \
 --enable-wddx \
 --enable-sysvmsg 
-make --quiet
+make -j2 --quiet
+make install
