tree 6a7cae1bee34d35f94cb8d6bbcd34b140e0bf84c
parent fa3f87ea9e009b5c8fb5806b1c0a6e4318e93464
parent 0aa8c60ae7eee0122c42ae17d42fd5471a575743
author Andrey Andreev <narf@bofh.bg> 1330433197 +0200
committer Andrey Andreev <narf@bofh.bg> 1330433197 +0200

Merge upstream branch