commit | 2134173e015a2c78d9970a14dc79ac58f1dedc09 | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Fri Mar 02 01:58:16 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Fri Mar 02 01:58:16 2012 +0200 |
tree | 68fb15c89f0f76167e56e6188ed9a28825537fa3 | |
parent | 10558496197b0c39756ec442af13ed1240910084 [diff] | |
parent | 963386ba6072d240840b58d6dbe54287edcb04ad [diff] |
Merge upstream branch