commit | dfdc23d86c1cc2ee26173db9c1a209eac736b5ab | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Feb 06 22:01:16 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Feb 06 22:01:16 2017 +0000 |
tree | 3e23ba79ab895d5dd752281ee41a940a4d835cb3 | |
parent | 7417e391d5ab127adb6c598776547119f516bb7b [diff] | |
parent | 68e04907de6a13933805d3437872bd859f4ce6c1 [diff] |
Merge branch 'obsd-master'