commit | 1eb9500644f058113c0b108a049e05efda5e3436 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jan 12 12:01:10 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jan 12 12:01:10 2017 +0000 |
tree | 47d128b5f4e7ffac044dfacbef88c13ac83ecc01 | |
parent | 4a768619251d19769765bd6ed0d58f0a8bfab235 [diff] | |
parent | dad3090d3201bd8272cb762beea8ef3aa8ce9673 [diff] |
Merge branch 'obsd-master'