]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7a6615 e9dfb0f)
merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 18 May 2012 12:24:09 +0000 (14:24 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 18 May 2012 12:24:09 +0000 (14:24 +0200)

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