Merge branch '5.4'

author Gustavo André dos Santos Lopes <cataphract@php.net>

Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)

committer Gustavo André dos Santos Lopes <cataphract@php.net>

Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)
author Gustavo André dos Santos Lopes <cataphract@php.net>
Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)
committer Gustavo André dos Santos Lopes <cataphract@php.net>
Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)
diff --cc ext/intl/resourcebundle/resourcebundle_class.c
Simple merge
author	Gustavo André dos Santos Lopes <cataphract@php.net>
	Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)
committer	Gustavo André dos Santos Lopes <cataphract@php.net>
	Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)