From: Éric Araujo <merwok@netwok.org> Date: Fri, 20 Aug 2010 03:22:35 +0000 (+0000) Subject: Recorded merge of revisions 84187 via svnmerge from X-Git-Tag: v3.1.3rc1~314 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dcc96c9cc337d8a9be22c49cd78de3646797287;p=python Recorded merge of revisions 84187 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84187 | eric.araujo | 2010-08-19 00:29:54 +0200 (jeu., 19 août 2010) | 2 lines Fix indentation level ........ ---