[parrot/parrot] fa4951: Merge branch 'master' into nqp_pct

[noreply at github.com]

  Branch: refs/heads/nqp_pct
  Home:   https://github.com/parrot/parrot

  Commit: fa4951ace716a31c088e90ef2fb8d8f2db68bcbf
      https://github.com/parrot/parrot/commit/fa4951ace716a31c088e90ef2fb8d8f2db68bcbf
  Author: Brian Gernhardt <brian.gernhardt at mail.rit.edu>
  Date:   2011-08-06 (Sat, 06 Aug 2011)

  Changed paths:
    M CREDITS
  M compilers/pge/README.pod
  M config/gen/makefiles/root.in
  M docs/index/pct_tutorial.json
  M docs/index/pdds.json
  M docs/index/tools.json
  M docs/project/git_workflow.pod
  M docs/project/release_manager_guide.pod
  A examples/languages/squaak/doc/pct-stages.png
  A examples/languages/squaak/doc/pct-stages.svg
  M examples/languages/squaak/doc/tutorial_episode_1.pod
  M examples/languages/squaak/doc/tutorial_episode_2.pod
  M examples/languages/squaak/doc/tutorial_episode_4.pod
  M examples/languages/squaak/doc/tutorial_episode_7.pod
  M lib/Parrot/Docs/PodToHtml.pm
  M runtime/parrot/library/Archive/Zip.pir
  M src/gc/system.c
  M src/nci_test.c
  M src/packfile/api.c
  M src/pmc/packfileview.pmc
  M src/pmc/ptr.pmc
  M src/pmc/unmanagedstruct.pmc
  M t/pmc/nci.t
  M tools/docs/make_html_docs.pl

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

Conflicts:
	compilers/pct/src/PAST/Compiler.pir