commit | 55c9e0366ee4477c34c881c942face4368cd4501 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sun Jan 12 08:10:39 2014 +0100 |
committer | Georg Brandl <georg@python.org> | Sun Jan 12 08:10:39 2014 +0100 |
tree | dcbf2f843faa2051275ee56aaa4bf9d8421d5705 | |
parent | 6392ad98d0f194e350c013599fbbb32f7ba5f3af [diff] | |
parent | b4cbb92fbe6290c3574e73288de9e9cbb60b7688 [diff] |
merge heads