merge with 3.3
authorGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 17:13:38 +0000 (19:13 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 17:13:38 +0000 (19:13 +0200)
1  2 
Doc/tutorial/modules.rst

Simple merge