| commit | 868163330c6e6eb7af04ee3b2510b594608d34ad | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Mar 13 12:23:37 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Mar 13 12:23:37 2012 +0200 |
| tree | 22cd130b389912376f00a3bd3128f56224d4687e | |
| parent | 60138567c58dd924e2240973e34f0e3903a7ef2b [diff] | |
| parent | e5617335b5130718c43e5072ad003f677619d332 [diff] |
Merge upstream branch