| commit | 96ad1d7779fafb3b11c6af34e715f32b8784f175 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Thu Feb 09 14:01:18 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Thu Feb 09 14:01:18 2017 +0000 |
| tree | a0700990bf4f2deb62ec401ff168539df9972848 | |
| parent | cb50a51127f02ea8cfe41152d35bcc27dffc83cf [diff] | |
| parent | b1fa3e25e437ae51b985dcfa964fb6da713b3c15 [diff] |
Merge branch 'obsd-master'