tree 1c0ed7a9d4f728868e01715515e9afd37e45631c
parent fa8cd4c77b1f2da010ab42c09d32844d61fe4029
parent 0aa8c60ae7eee0122c42ae17d42fd5471a575743
author Andrey Andreev <narf@bofh.bg> 1330432979 +0200
committer Andrey Andreev <narf@bofh.bg> 1330432979 +0200

Merge upstream branch