Merge with 3.2
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 16 Mar 2013 19:56:50 +0000 (15:56 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 16 Mar 2013 19:56:50 +0000 (15:56 -0400)
1  2 
Doc/library/functions.rst

Simple merge