summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-12-13 10:44:56 +0800
committerXinchen Hui <laruence@php.net>2012-12-13 10:44:56 +0800
commit1f516510b77eade91e56de4f64183ea44d0cde0f (patch)
tree703e8e4dacac3d37b74a234d5bde9bb8100ee1e2
parent2d1694d4ebd51ab61f12e6bc545a17e3baf3b4a0 (diff)
parent39a3007ab2f88d860beb524024ab97fb13110561 (diff)
downloadphp-git-1f516510b77eade91e56de4f64183ea44d0cde0f.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--ext/spl/spl_observer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 60c3188dd3..2176e025ab 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -4,7 +4,7 @@
+----------------------------------------------------------------------+
| Copyright (c) 1997-2012 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is SplSubject to version 3.01 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |