From: David Soria Parra <dsp@php.net>
Date: Tue, 20 Mar 2012 16:29:20 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: PHP-5.4.1-RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d894cd421d96517618e9d33dfea640499c8ffd;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Adding Braces in json.c to conform with coding standards
---

71d894cd421d96517618e9d33dfea640499c8ffd