Describe: sync_20150323-10461-gccd17e1 Commit: ccd17e133f90c272d0e9abfc74b787380aa7e880
Modifications:
lang/php/7.0/Makefile | 2 +-
lang/php/Makefile.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Log messages:
couple stdc++ merge errors
