Author: Alexander Hesse
Branch: split-rpython
Changeset: r60183:777d30901063
Date: 2013-01-18 19:55 +0100
http://bitbucket.org/pypy/pypy/changeset/777d30901063/
Log:hg merge default
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy
Author: Alexander Hesse
Branch: split-rpython
Changeset: r60144:8d03ae695f01
Date: 2013-01-17 21:08 +0100
http://bitbucket.org/pypy/pypy/changeset/8d03ae695f01/
Log:hg merge default
diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py
b/pypy/module/micronumpy/arrayimpl/concrete.py
---
Author: Alexander Hesse
Branch: split-rpython
Changeset: r60115:daaeb86c9502
Date: 2013-01-17 00:52 +0100
http://bitbucket.org/pypy/pypy/changeset/daaeb86c9502/
Log:hg merge default
diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/
Author: Alexander Hesse
Branch: split-rpython
Changeset: r60074:df8704aa6585
Date: 2013-01-15 02:49 +0100
http://bitbucket.org/pypy/pypy/changeset/df8704aa6585/
Log:hg merge default
diff --git a/goal/targetpypystandalone.py b/goal/targetpypystandalone.py
--- a/goal/targetpypystandalone.py
++
