commit | d54e990c4ffb576aa3d82306b970dc64bdd4cda6 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Oct 17 00:01:11 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Oct 17 00:01:11 2016 +0100 |
tree | 14657ab6804e8dcb4ee696afd823e19e46e0631f | |
parent | 1a6e696b08113ca17ee8e881844167cf94276846 [diff] | |
parent | fe106842c879c8f2d0419afba4f90ce0c62c5e80 [diff] |
Merge branch 'obsd-master'