tree af24574a1c5345197041b73f5cbd3274dd4a0926
parent 97d4c29dc465f953c0cdf262840bd882bcc8af72
parent 5148029aaf204fb3e7e4f24a794bee781d0c218b
author Andrey Andreev <narf@bofh.bg> 1330077257 +0200
committer Andrey Andreev <narf@bofh.bg> 1330077257 +0200

Merge upstream branch