tree b4fb4746722ca834e3fbdbdf4c54ca747a1f8c7f
parent b78c64b0bb43333c5d74d718cd1270e514f44071
parent 5148029aaf204fb3e7e4f24a794bee781d0c218b
author Andrey Andreev <narf@bofh.bg> 1330077517 +0200
committer Andrey Andreev <narf@bofh.bg> 1330077517 +0200

Merge upstream branch