commit | 93f42d360b8dbeff738992c15067d608ead16c21 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jun 16 14:01:11 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jun 16 14:01:11 2016 +0100 |
tree | 4f9cc77ac128f028a343bcc73651a8f12c61d099 | |
parent | d35a9ac5f20f65eecd1822e9a4ace2033756656a [diff] | |
parent | 325cbe90d925d3deb90559463b6d968c31fa5924 [diff] |
Merge branch 'obsd-master'