Permalink
Browse files

Merge branch 'PHP-5.4'

This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
  • Loading branch information...
2 parents 773bedb + dffd029 commit b204f36eb32a5966a2d533305358977b048abf0d @dsp dsp committed Mar 19, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit b204f36

Please sign in to comment.