tree 5187330ec54e46fdd251d95a0212cf3fb7744b5b
parent 996c9fee5a53443de34240c41c3936c3527aa3ce
parent 733921ecc4da80f08a9d50ff0fb05bccf23de09d
author Andrey Andreev <narf@bofh.bg> 1332250995 +0200
committer Andrey Andreev <narf@bofh.bg> 1332250995 +0200

Merge upstream branch