merge heads

This commit is contained in:
Benjamin Peterson 2011-06-19 09:38:02 -05:00
commit 12f2bffce1
11 changed files with 118 additions and 96 deletions

View file

@ -24,7 +24,7 @@ tracebacks:
* Only ASCII is supported. The ``backslashreplace`` error handler is used on
encoding.
* Each string is limited to 100 characters.
* Only the the filename, the function name and the line number are
* Only the filename, the function name and the line number are
displayed. (no source code)
* It is limited to 100 frames and 100 threads.