| commit | bb25546938d9d9d3e207ff5d8d926c7619382b9d | [log] [tgz] |
|---|---|---|
| author | Vitalii Samolovskikh <kefir@perm.ru> | Mon Nov 04 15:13:36 2013 +0600 |
| committer | Vitalii Samolovskikh <kefir@perm.ru> | Mon Nov 04 15:13:36 2013 +0600 |
| tree | 959f3bc1fad1d5dc8639f2c059e8c1c3b9ac3e4d | |
| parent | 4738830e77a8f31d30c1443842a65b602c158147 [diff] |
Resolve merge conflict.