| commit | 10558496197b0c39756ec442af13ed1240910084 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Thu Mar 01 20:28:50 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Thu Mar 01 20:28:50 2012 +0200 |
| tree | 925eb59aba11d293d9afcfcd8de5b997e0ac52a9 | |
| parent | a0ad9efd667343e21b03f88f006e672cd7263a95 [diff] | |
| parent | 8edf87dbb0dcbe61e8cbaa6229c70a46bee6dbd4 [diff] |
Merge upstream branch