commit | e2a82eaa8762c88134302674955b31d843249a19 | [log] [tgz] |
---|---|---|
author | Christian Heimes <christian@python.org> | Sun Aug 11 15:21:09 2013 +0200 |
committer | Christian Heimes <christian@python.org> | Sun Aug 11 15:21:09 2013 +0200 |
tree | 3593bbfda73ad0b23470b9cd2b8926f531a1923f | |
parent | 0797276a4e334b4adb12ccd90f4fcb19dba2ec42 [diff] | |
parent | f0091d0f4c12177eec3216567eae229cf694e320 [diff] |
Merge remote-tracking branch 'upstream/master'