[parrot/parrot] d7db4f: Fix MANIFEST from merge of branch "ffa_sort"

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/parrot/parrot
  Commit: d7db4f5ee22f432c7c4aa0028559da82c772e84b
      https://github.com/parrot/parrot/commit/d7db4f5ee22f432c7c4aa0028559da82c772e84b
  Author: Bruce Gray <bruce.gray at acm.org>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M MANIFEST

  Log Message:
  -----------
  Fix MANIFEST from merge of branch "ffa_sort"


  Commit: a3c275418a14fb35e68f60201126ee7d7b9319da
      https://github.com/parrot/parrot/commit/a3c275418a14fb35e68f60201126ee7d7b9319da
  Author: Bruce Gray <bruce.gray at acm.org>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M examples/benchmarks/sort_ffa.pir
    M src/pmc/fixedfloatarray.pmc

  Log Message:
  -----------
  Fix POD from merge of branch "ffa_sort"


  Commit: 5120d027af077d094f995576f540a809414bbac4
      https://github.com/parrot/parrot/commit/5120d027af077d094f995576f540a809414bbac4
  Author: Bruce Gray <bruce.gray at acm.org>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M src/io/utilities.c

  Log Message:
  -----------
  Revert "Merge pull request #943 from gerdr/fix-socket-readline"

This reverts commit fb2e9570d25950c568edc50c1f9f5b1e0275bc2a, reversing
changes made to 83bb8639bc79699a16d594d53ca8abd92788ab03.

This is needed for the duration of the 5.2.0 release process, because the
branch was merged prematurely, and causes test failures. When the branch is
in a completed state, and ready to merge, it is important that a
"revert-the-revert" is performed just before the merge:
    git revert ID-of-*this*-revert
For rationale, see:
https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt


  Commit: dfc3d7c34f5707b617e41d0befab4de66be68112
      https://github.com/parrot/parrot/commit/dfc3d7c34f5707b617e41d0befab4de66be68112
  Author: Bruce Gray <bruce.gray at acm.org>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M ChangeLog
    M README.pod
    M RESPONSIBLE_PARTIES
    M VERSION
    M docs/parrothist.pod
    M docs/project/release_manager_guide.pod
    M tools/release/release.json

  Log Message:
  -----------
  Prepare for the 5.2.0 release


Compare: https://github.com/parrot/parrot/compare/d3bd99f652e8...dfc3d7c34f57