commit | fa68d0a16ec757bd5ef148bf7060707512baa303 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jun 06 12:01:10 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jun 06 12:01:10 2016 +0100 |
tree | 808b7c5ccc9cf67ed71b93b7e76aca0d57a724aa | |
parent | cc096ae9291c35887679c7031c24cac218ddc319 [diff] | |
parent | d9450bfccd3dc0c55c412a1871a70d3e94dd7be6 [diff] |
Merge branch 'obsd-master'