| commit | f6600f840125eadf2366c2244f78ad95defb156b | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Fri Feb 07 15:21:43 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Fri Feb 07 15:21:43 2014 +0200 |
| tree | de10a75d901530daf719a2f503de4fc59f8bd0ed | |
| parent | 81e10644861c86437cf197b54af096894b41cd63 [diff] | |
| parent | c697a3bfdfc301718058a09fd5692fbecee6920a [diff] |
Merge branch 'develop' into feature/encryption