tree 1afb9d29270f856a9dcf7e79a4eb2df7a55bae56
parent ce03dae16b6a6e8a74a5a472bbf7b6e9e3341a05
parent 5148029aaf204fb3e7e4f24a794bee781d0c218b
author Andrey Andreev <narf@bofh.bg> 1330077296 +0200
committer Andrey Andreev <narf@bofh.bg> 1330077296 +0200

Merge upstream branch