| commit | 2f136f11685e43025b2f3f98c05d60dd4502e8dd | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Fri Mar 02 13:12:16 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Fri Mar 02 13:12:16 2012 +0200 |
| tree | fe062a9f4004f60fd120275953efee035f6c15a0 | |
| parent | 5d391521a99dc4a4716756871d025bba80b151b3 [diff] | |
| parent | 8f22057724dd8fe2b9d41ba98bfc4da282572c5e [diff] |
Merge upstream branch