| commit | 86f46f4628f63ef63d28de78da0d8d73013d5a8c | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Wed Feb 05 12:46:36 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Wed Feb 05 12:46:36 2014 +0200 |
| tree | aa85ab0d40fdc0ff771aae37ab957b8704058b48 | |
| parent | 4a2918a33c756ac7cc9defc2e6acd371e4412af6 [diff] | |
| parent | aaa8ddb5a48af8f37cf1015a7768957cce41acd3 [diff] |
Merge branch 'develop' into feature/encryption