commit | a64b7cfe5d20b6193d58903b0ee82aed412071a3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Dec 10 00:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Dec 10 00:01:11 2016 +0000 |
tree | 8212e5cad350c58ee1ab3c4de9b849a94973f462 | |
parent | 75135ded0922986a4aa616f449978b64c15f1da9 [diff] | |
parent | bee95bf378ab45d4671fd086a4dd24b7259cf772 [diff] |
Merge branch 'obsd-master'