]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc7ea58 3be0095)
Issue #13093: Perform a real merge.
authorCharles-François Natali <neologix@free.fr>
Tue, 22 Nov 2011 17:53:49 +0000 (18:53 +0100)
committerCharles-François Natali <neologix@free.fr>
Tue, 22 Nov 2011 17:53:49 +0000 (18:53 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.