| commit | 817164d822ce5dc1159ddc3e8fad2fa094dfc5ea | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Mar 20 16:59:04 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Mar 20 16:59:04 2012 +0200 |
| tree | 125069e2089d0e0ee3b8337b7acac6050ca1e045 | |
| parent | 4b4363871256df9009bb4245def8f89420331cfd [diff] | |
| parent | 8480f7c35af9aacaf2ebee43677ff1d31a5cce13 [diff] |
Merge upstream branch