From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 1 Jun 2008 08:32:41 +0000 (+0000)
Subject: Blocked revisions 63848-63849 via svnmerge
X-Git-Tag: v3.0b1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21491717bddcee1ed4a19cac7d15ff4cc2c0d48a;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 63848-63849 via svnmerge

........
  r63848 | martin.v.loewis | 2008-06-01 10:06:17 +0200 (So, 01 Jun 2008) | 2 lines

  Move sys_stream and sys_isatty out of the have-langinfo block.
........
  r63849 | martin.v.loewis | 2008-06-01 10:19:02 +0200 (So, 01 Jun 2008) | 2 lines

  Typo: encoding -> codeset.
........
---