commit | 4f077fe62c4768d479f22f2a46a91f2154eccb01 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jan 14 20:01:13 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 14 20:01:13 2017 +0000 |
tree | cca3fb8c86f7d126b6e7e305fbb2f1aa595c7829 | |
parent | 780dd7ac823215f1c3a468816db18ab745b22d49 [diff] | |
parent | e06efab9da1f4edb3cb631dc752d7786d5edb5cf [diff] |
Merge branch 'obsd-master'