Merge branch 'master' into jsond

Conflicts:
	ext/json/JSON_parser.c
	ext/json/JSON_parser.h
	ext/json/json.c
	ext/json/utf8_decode.c

1 files changed, 3 insertions, 3 deletions

diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h
index 7bdeb86faa..628f13111c 100644
--- a/ext/mbstring/php_unicode.h
+++ b/ext/mbstring/php_unicode.h
@@ -16,16 +16,16 @@
    +----------------------------------------------------------------------+
 
 	Based on code from ucdata-2.5, which has the following Copyright:
-   
+
 	Copyright 2001 Computing Research Labs, New Mexico State University
- 
+
 	Permission is hereby granted, free of charge, to any person obtaining a
 	copy of this software and associated documentation files (the "Software"),
 	to deal in the Software without restriction, including without limitation
 	the rights to use, copy, modify, merge, publish, distribute, sublicense,
 	and/or sell copies of the Software, and to permit persons to whom the
 	Software is furnished to do so, subject to the following conditions:
- 
+
 	The above copyright notice and this permission notice shall be included in
 	all copies or substantial portions of the Software.
 */