commit | afdef6d122ab667a48b843af74541e9aafcf98e6 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Nov 11 12:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Nov 11 12:01:11 2016 +0000 |
tree | c60dccf788c2fb34d50e19aef817e1a2aeac1790 | |
parent | 13f1a922e180bc8345a32929bbaa74f307569081 [diff] | |
parent | 36f8fa316d483d19a6399c1b8a18dc4c0fe99081 [diff] |
Merge branch 'obsd-master'