commit | 8a8001350db320f6c8adfef161f96d0abb67e2b4 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 23 18:01:19 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 23 18:01:19 2016 +0000 |
tree | 315159db7eb6665c32d0bed155222ae627c80b44 | |
parent | 442e49f51c07a1fc508c6889d77065b8b4894893 [diff] | |
parent | 6de466cf8b665d8725301307c57f6d8cb2e65a3f [diff] |
Merge branch 'obsd-master'