]> granicus.if.org Git - python/commitdiff
merge:Do not add txt files twice
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 5 Jun 2011 17:43:56 +0000 (19:43 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 5 Jun 2011 17:43:56 +0000 (19:43 +0200)

Trivial merge