]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00a47b8 a2353aa)
merge from push conflict.
authorSenthil Kumaran <orsenthil@gmail.com>
Wed, 13 Apr 2011 01:38:51 +0000 (09:38 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Wed, 13 Apr 2011 01:38:51 +0000 (09:38 +0800)

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