commit | 4a768619251d19769765bd6ed0d58f0a8bfab235 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Jan 12 02:01:11 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Jan 12 02:01:11 2017 +0000 |
tree | 038566f9bbe7dc3db41b9e27ff65c9df4bd54746 | |
parent | 33ebb9ec39e175197b9a7ba7071aeea472f76e8b [diff] | |
parent | 9b6aeacdc0118d97c35e822c958e925f12b513ed [diff] |
Merge branch 'obsd-master'