tree 767cfc8e812e95206f1394e888d6cedbcf13a576
parent 891b7c6ea68a87127d51eb01b401a948f6ae3753
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330624140 +0200
committer Andrey Andreev <narf@bofh.bg> 1330624140 +0200

Merge upstream branch