commit | 2311bbd28a227a8b6e6e52bf30665b37315cad11 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 13 12:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 13 12:01:12 2017 +0000 |
tree | 01fc816db0980b40d0b75905a097b20719fd4156 | |
parent | d4cb178249c6c73c6197e34e871c2b8e803de175 [diff] | |
parent | 95950bf668cee5a80cd9bbe28d7134a52a240426 [diff] |
Merge branch 'obsd-master'