| commit | 8c7138a7cc6a9a855fc10763afb2571d7f1cec75 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Fri Feb 07 14:54:56 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Fri Feb 07 14:54:56 2014 +0200 |
| tree | b23a13c799a788d8b01fac0632961ef4f9d7929c | |
| parent | 03077f9ab1408d28b5b9783355d1629eda3ff5ae [diff] | |
| parent | 31e5cfd672fe3d37e3a317b71ea207027e4f9353 [diff] |
Fix conflicts