| commit | e5b31fce3e74c9b28f9fb9a904b4e2f29873293d | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Mon Jan 09 15:18:25 2017 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Mon Jan 09 15:18:25 2017 +0200 |
| tree | 32a66c3a806f34b2c77c96c432f551b27c756e6e | |
| parent | e898e565c60617dbc43186c14018519d8ef05042 [diff] | |
| parent | 61fd92498db72bc511effa8c15274596afbb5010 [diff] |
Merge branch 'security' into 3.1-stable