| commit | 2e84b74a6501960194bb2967507283e272b8b5e4 | [log] [tgz] |
|---|---|---|
| author | Kirill Shirinkin <fodojyko@gmail.com> | Fri Feb 12 18:12:51 2016 +0100 |
| committer | Kirill Shirinkin <fodojyko@gmail.com> | Fri Feb 12 18:12:51 2016 +0100 |
| tree | 427390e13c95e4f915e3777e2d82127fb3ebcb0b | |
| parent | 3b07ffd6240bc0d27165848e48b595d373cdc922 [diff] | |
| parent | 6769c3b3e54a5cf1b0bdb10ea5b25f5cff0a3134 [diff] |
Resolve conflicts