tree d39092f36aff1c81db2a644be950437f135d1fd6
parent bfe6922c7a10701aee56ee9072243cf58d9e96a4
parent a19beb0c580ac78c4b75548a046240a85f30cb29
author Andrey Andreev <narf@bofh.bg> 1330742268 +0200
committer Andrey Andreev <narf@bofh.bg> 1330742268 +0200

Merge upstream branch