tree a7762a0494558dba944fdec248ec23b7fd82e4c5
parent cf8bb891df6f42850f57d715ab14af81c9fbd960
parent 0aa8c60ae7eee0122c42ae17d42fd5471a575743
author Andrey Andreev <narf@bofh.bg> 1330433455 +0200
committer Andrey Andreev <narf@bofh.bg> 1330433455 +0200

Merge upstream branch