commit | 1a53e790576b3cd04277ecb7550cf4863be33530 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jun 10 14:01:10 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jun 10 14:01:10 2016 +0100 |
tree | 6800491ead94bb036c8d7b29de453335b89ed476 | |
parent | c84ed36719f8bfc72ef52e8e0a43003464de587e [diff] | |
parent | 17e474445983ce4fd28cf181829657f1b8ff6ad1 [diff] |
Merge branch 'obsd-master'