]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 23 Nov 2013 20:06:21 +0000 (21:06 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 23 Nov 2013 20:06:21 +0000 (21:06 +0100)
1  2 
Modules/_pickle.c

Simple merge