| commit | 7ff563d5bf7d91441d075d5abae91d212fcb134c | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 00:50:17 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 00:50:17 2012 +0200 |
| tree | d11f283eaa07feacb2592f61049e35253a08ddaa | |
| parent | f863a02e314813753662106459e93f6675b1566e [diff] | |
| parent | 27c80af1dd9b871ab44452a8de22fd9cabaa184c [diff] |
Merge upstream