| commit | a14414dfe91d964f75749e30c8c6eeb34696bdc9 | [log] [tgz] |
|---|---|---|
| author | Antoine Pitrou <solipsis@pitrou.net> | Sun Nov 02 18:42:41 2014 +0100 |
| committer | Antoine Pitrou <solipsis@pitrou.net> | Sun Nov 02 18:42:41 2014 +0100 |
| tree | fe0c88f9a3457554b16be5a29379aab36ced3fe7 | |
| parent | 8a03896cace7cf2b8634c1409722fe6d3f9c8bcd [diff] | |
| parent | 07df6555c43d54d1708eeee5e27828151e977627 [diff] |
Merge heads