]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21cc628 4b4e38e)
merge
authorBrett Cannon <brett@python.org>
Sat, 25 May 2013 15:33:13 +0000 (11:33 -0400)
committerBrett Cannon <brett@python.org>
Sat, 25 May 2013 15:33:13 +0000 (11:33 -0400)
1  2 
Doc/reference/import.rst patch | diff1 | diff2 | blob | history

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