Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 23 Oct 2011 21:50:21 +0000 (23:50 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 23 Oct 2011 21:50:21 +0000 (23:50 +0200)
commit5a705e72db2d1a0f232115fb65eea55af57b4883
treef5e275d3343c43e1a4147fe891520d8182d5311a
parent24d659daafd0e6c1514ee912f06f7b7310545e09
parent2d99dac479fe89a2cbc616cc9c99b5d37c105d24
Merge