tree 5f43620d788bf38249956d96dee3fedda2692da7
parent c100e973bc82b2a5936292887c004827e36fd73d
parent 963386ba6072d240840b58d6dbe54287edcb04ad
author Andrey Andreev <narf@bofh.bg> 1330646536 +0200
committer Andrey Andreev <narf@bofh.bg> 1330646536 +0200

Merge upstream branch