| commit | 072ad622583f79967ed9ab8269911c6700a95a2f | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Dec 20 15:08:09 2011 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Dec 20 15:08:09 2011 +0200 |
| tree | 2fc7d768eb364846c1bbd6623696fe4cb85c500a | |
| parent | 4eea9895e8ced75a1099c56215c09773de94b92c [diff] | |
| parent | fec2f59721af5721ede0d2b60075910a6b646c03 [diff] |
Merge remote-tracking branch 'upstream/develop' into develop