| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Tue Nov 11 14:33:16 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Tue Nov 11 14:33:16 2014 +0200 |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c [diff] | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 [diff] |
Fix merge conflicts