Closes #13361: Merge fix from 3.2.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 7 Nov 2011 10:15:55 +0000 (10:15 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 7 Nov 2011 10:15:55 +0000 (10:15 +0000)
1  2 
Lib/logging/__init__.py
Lib/test/test_logging.py

Simple merge
Simple merge