| commit | c2804a3f3eb085abcc50e8df51085db7a94c18d2 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Sun Feb 09 17:30:06 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Sun Feb 09 17:30:06 2014 +0200 |
| tree | b53e8a2798a75fa4f92ee2cc3201635ce7df319a | |
| parent | f6600f840125eadf2366c2244f78ad95defb156b [diff] | |
| parent | db97fe561f03284a287c9a588ac1ff19a9f5e71d [diff] |
Merge branch 'develop' into 'feature/encryption'