| commit | 189a34ec0949c6e96c896b92a8b1ea09ae9f232c | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Jan 10 22:04:29 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Jan 10 22:04:29 2012 +0200 |
| tree | ddb25a94de1095598e1b88bc2d082552cef392e5 | |
| parent | 3c7c461a93145b045ba688585a5b606e28b7d7cb [diff] | |
| parent | b790371f328e49ed57eda85bf33817e033b85601 [diff] |
Merge upstream branch