[parrot/parrot] 1024f0: Merge branch 'master' of github.com:parrot/parrot

[noreply at github.com]

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

  Commit: 1024f0d53ce6a2366d8f90efc9c9703914d8dc1a
      https://github.com/parrot/parrot/commit/1024f0d53ce6a2366d8f90efc9c9703914d8dc1a
  Author: Christoph Otto <christoph_github at mksig.org>
  Date:   2011-07-13 (Wed, 13 Jul 2011)

  Changed paths:
    M frontend/pbc_disassemble/main.c
  M src/pmc/string.pmc
  M t/op/exceptions.t
  M t/pmc/iterator.t
  M t/pmc/string.t

  Log Message:
  -----------
  Merge branch 'master' of github.com:parrot/parrot


  Commit: 2b98378eb98fcf62c16b73579dfef4ceafde8c87
      https://github.com/parrot/parrot/commit/2b98378eb98fcf62c16b73579dfef4ceafde8c87
  Author: Christoph Otto <christoph_github at mksig.org>
  Date:   2011-07-13 (Wed, 13 Jul 2011)

  Changed paths:
    M CREDITS
  M t/library/perlhist.txt

  Log Message:
  -----------
  add jay++ to CREDITS


Compare: https://github.com/parrot/parrot/compare/c2c0d12...2b98378