]> granicus.if.org Git - python/commitdiff
Merge 3.1
authorÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:42:52 +0000 (02:42 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:42:52 +0000 (02:42 +0200)
1  2 
Doc/distutils/examples.rst
Doc/library/json.rst

Simple merge
Simple merge