commit | dc42c35f1f04d3bd431c52dde0906965c6db2d6c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Jan 19 18:01:15 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Jan 19 18:01:15 2016 +0000 |
tree | 6b9e46226bd4ef64ab3e1c5c8bd65bdbc3cce3b9 | |
parent | 5d21faa99c9a005208e88be72ef2c1e02cf6d128 [diff] | |
parent | b5b5221c13ded5b141fa35f60c707c9c403b83a6 [diff] |
Merge branch 'obsd-master'