| commit | f69104f15a49439170f91bdd86d6a19cdb26348a | [log] [tgz] |
|---|---|---|
| author | Serhiy Storchaka <storchaka@gmail.com> | Fri Sep 04 08:39:33 2015 +0300 |
| committer | Serhiy Storchaka <storchaka@gmail.com> | Fri Sep 04 08:39:33 2015 +0300 |
| tree | 3a2a13481251ea7d5a50a4475267aea7d69eedb7 | |
| parent | e1a4c57663baa16be8bb682c1b890a84087cd21f [diff] | |
| parent | 6e87576571b5d2decc7d3e554d1c3ce31e455145 [diff] |
Fixed merge error.