tree 5a7d8232b418719e30c524eccd8fb3b746d77336
parent 6f7af78e253ddcff3770c5497f804367b098d09b
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330624489 +0200
committer Andrey Andreev <narf@bofh.bg> 1330624489 +0200

Merge upstream branch