commit | 780dd7ac823215f1c3a468816db18ab745b22d49 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 13 14:01:13 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 13 14:01:13 2017 +0000 |
tree | 9e57b7b042c5dac2c1df03f07e5acd6464519b83 | |
parent | 2311bbd28a227a8b6e6e52bf30665b37315cad11 [diff] | |
parent | 08d21936e4559a92174361d7785ca3e967972edb [diff] |
Merge branch 'obsd-master'