| commit | ce747c8a1e72a30f5369de7d56ba91b72f0e2eb3 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Fri Apr 27 11:54:40 2012 +0300 |
| committer | Andrey Andreev <narf@bofh.bg> | Fri Apr 27 11:54:40 2012 +0300 |
| tree | 32433143610df1683131dba5cf4437ddadc306c6 | |
| parent | 870ad190f068ec16aad45622528ba6747c61c120 [diff] | |
| parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c [diff] |
Merge upstream branch