| commit | ab350e0f6f6aadd9fafa0440a8b16dfcdcec9a41 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Mon Mar 12 09:28:22 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Mon Mar 12 09:28:22 2012 +0200 |
| tree | 254a9f95d69a7a63394d02cbf635dc6f89bae2ba | |
| parent | 20bd7bc3f9e3c370954a0abead4f87043b99e040 [diff] | |
| parent | 5fe23e863b79fe03fb8e73f7c77bd1c75f4de12d [diff] |
Fix conflicts (or at least trying to do so)