tree 989e85b77b67d3b7b6e027116361235279c72b2e
parent b0b2d041ebad1382bf314fccbae1469a5fe7fad9
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330623705 +0200
committer Andrey Andreev <narf@bofh.bg> 1330623705 +0200

Merge upstream branch