Reapply @bperel's fix for xdiff_string_patch
Merge branch 'master' of git@github.com:kvz/phpjs.git