| commit | 20557d2aee5b9b445f0f581f8176456f325562b2 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Thu Feb 16 11:41:32 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Thu Feb 16 11:41:32 2012 +0200 |
| tree | 0ac91fe19e3bf6fcf3d8c558d3fd5fde46bc27d2 | |
| parent | fb1116fcc53404f15387adffe7756d1965014b56 [diff] | |
| parent | 827a92a6965612b185ae2e6766b6fb7740cd0cc2 [diff] |
Merge upstream branch