commit | 7417e391d5ab127adb6c598776547119f516bb7b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Feb 06 20:01:15 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Feb 06 20:01:15 2017 +0000 |
tree | fe721d25daee95d003d66157af1ec1faf6734252 | |
parent | 1199f8fc59f34f474672cb95a781d3a817d05242 [diff] | |
parent | 10e14ae504df467234284a1040e91d48b41b2dd0 [diff] |
Merge branch 'obsd-master'