From: Georg Brandl <georg@python.org>
Date: Mon, 25 May 2009 21:13:54 +0000 (+0000)
Subject: Blocked revisions 72678,72710 via svnmerge
X-Git-Tag: v3.1rc1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b53cb7dbac2230a8461a7f8902af6f13c0a9177;p=python

Blocked revisions 72678,72710 via svnmerge

........
  r72678 | georg.brandl | 2009-05-16 13:21:29 +0200 (Sa, 16 Mai 2009) | 1 line

  #2856: document 2.x os.listdir() behavior for undecodable filenames.
........
  r72710 | georg.brandl | 2009-05-17 10:36:04 +0200 (So, 17 Mai 2009) | 1 line

  #5942: Copy over flag table from dbm.rst which is clearer.
........
---