commit | 55d472a9fe9b3d4196b8307a65480f6d66b95e9c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 18:01:09 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 18:01:09 2016 +0100 |
tree | e76c0961ba35fa67566947ea0247dc0aed3e1ce4 | |
parent | ba9f32b464effc09b7ceaef21b1804c49ece17db [diff] | |
parent | eb8e76d4332e089e5cd3c5a3c9f4bf64c9474909 [diff] |
Merge branch 'obsd-master'