[parrot/parrot] : Merge branch 'master' into interp_api_cleanup

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/parrot/parrot
  Commit: 8b416960171e55f7d08d9291b0c953774d5e7e62
      https://github.com/parrot/parrot/commit/8b416960171e55f7d08d9291b0c953774d5e7e62
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M .gitignore
  M CREDITS
  M ChangeLog
  M MANIFEST
  M MANIFEST.SKIP
  M MANIFEST.generated
  M README
  M VERSION
  A docs/binaries/ops2c.pod
  A docs/binaries/parrot.pod
  M docs/book/pir/ch08_io.pod
  M docs/parrothist.pod
  M docs/project/release_manager_guide.pod
  M examples/pir/make_hello_pbc.pir
  M ext/winxed/compiler.pir
  M ext/winxed/driver.pir
  M include/parrot/oplib/core_ops.h
  M include/parrot/pointer_array.h
  M lib/Parrot/Manifest.pm
  M runtime/parrot/library/Archive/Tar.pir
  M runtime/parrot/library/Archive/Zip.pir
  M runtime/parrot/library/Configure/genfile.pir
  M runtime/parrot/library/ProfTest/PIRProfile.nqp
  M runtime/parrot/library/Test/Builder/Output.pir
  M runtime/parrot/library/osutils.pir
  M src/extend.c
  M src/ops/core_ops.c
  M src/pmc/arrayiterator.pmc
  M src/pmc/filehandle.pmc
  M src/pmc/hashiterator.pmc
  M src/pmc/iterator.pmc
  M src/pmc/orderedhashiterator.pmc
  M src/pmc/stringiterator.pmc
  M t/compilers/imcc/syn/op.t
  M t/dynpmc/gziphandle.t
  M t/pmc/io.t
  M t/pmc/packfile.t
  M t/pmc/stringhandle.t
  M tools/dev/install_files.pl
  M tools/release/release.json

  Log Message:
  -----------
  Merge branch 'master' into interp_api_cleanup


  Commit: e412704c5c3ca8754fedb3dc371a27a3dbc8bec3
      https://github.com/parrot/parrot/commit/e412704c5c3ca8754fedb3dc371a27a3dbc8bec3
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M MANIFEST

  Log Message:
  -----------
  fix conflict in manifest


Compare: https://github.com/parrot/parrot/compare/5b125a1...e412704