| commit | 416f360a19118c4692e430f0a1f5d12f81876ee7 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Mon Apr 09 16:32:25 2012 +0300 |
| committer | Andrey Andreev <narf@bofh.bg> | Mon Apr 09 16:32:25 2012 +0300 |
| tree | 5eaebb3c25f5665bee71a2f4283e949bb7614ae0 | |
| parent | 2271874d9c2bb4d5959f4287dea3c7c3b5b0c732 [diff] |
Fix changelog merge conflict