commit | 4cc05517732f012092e36e3458bcbea11282582c | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sat Oct 11 15:08:18 2014 +0200 |
committer | Georg Brandl <georg@python.org> | Sat Oct 11 15:08:18 2014 +0200 |
tree | b7ecd0bad3ba380ab1fa6817e88996998956b8b0 | |
parent | c8bd53f81512acf805708abca31f5491c13ae185 [diff] | |
parent | dbf834440423ce1e52c6175071fcb7538eab75f9 [diff] |
merge