tree 2fc7d768eb364846c1bbd6623696fe4cb85c500a
parent 4eea9895e8ced75a1099c56215c09773de94b92c
parent fec2f59721af5721ede0d2b60075910a6b646c03
author Andrey Andreev <narf@bofh.bg> 1324386489 +0200
committer Andrey Andreev <narf@bofh.bg> 1324386489 +0200

Merge remote-tracking branch 'upstream/develop' into develop