| commit | b6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed Oct 26 14:01:13 2016 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Wed Oct 26 14:01:13 2016 +0100 |
| tree | 120d8a7ffeb0774aec27ab77acf350b72f2a6f95 | |
| parent | f523fddf6a5f19e769e21add6632094265819e55 [diff] | |
| parent | abea17afd9e85d88a14be0222d094c37ef7975b6 [diff] |
Merge branch 'obsd-master'