tree 058e70e73708290ea49d5ed5c6e8d58a166bb5d4
parent ca365356e49ee32a1f03aa2d58f452b2a494268c
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330623606 +0200
committer Andrey Andreev <narf@bofh.bg> 1330623606 +0200

Merge upstream branch