]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f51d36a 79ed84c)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 30 Dec 2011 19:47:49 +0000 (13:47 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 30 Dec 2011 19:47:49 +0000 (13:47 -0600)
1  2 
Doc/library/logging.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/logging.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.