Permalink
Browse files

Merge branch 'PHP-5.4' (merge with strategy ours)

Change does not apply to master where the min ICU version is 4.0

* PHP-5.4:
  Bug #62933: compilation error with ICU 3.4
  • Loading branch information...
2 parents 7179c11 + 1ce572c commit a89c95552c23d8fda8f0c4038832ff21d2d42eee @cataphract cataphract committed Aug 26, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit a89c955

Please sign in to comment.