Merge remote-tracking branch 'origin/5_6_mountainlion' into 5_6_yosemite

* origin/5_6_mountainlion:
  5.6.25

build-php.pl

@@ -60,7 +60,7 @@
 			suffix       => '-apache2',
 		},
 	},
-	version              => '5.6.23',
+	version              => '5.6.25',
 	release              => 1,
 	debug                => 1,
 );