tree de10a75d901530daf719a2f503de4fc59f8bd0ed
parent 81e10644861c86437cf197b54af096894b41cd63
parent c697a3bfdfc301718058a09fd5692fbecee6920a
author Andrey Andreev <narf@devilix.net> 1391779303 +0200
committer Andrey Andreev <narf@devilix.net> 1391779303 +0200

Merge branch 'develop' into feature/encryption