tree 24e3b8b6f738c9a7443e88312c808787dacb14fa
parent 11c111c3ff128791f571ac2519bb796baecf7226
parent ea09a8a5552f2aacdeab0c88a605fe44047ebd0a
author Andrey Andreev <narf@bofh.bg> 1333738197 +0300
committer Andrey Andreev <narf@bofh.bg> 1333738197 +0300

Merge upstream branch