commit | 21d8f77a0d45c187b1d3f5b745acbb70e3b880c6 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Jan 25 16:01:13 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Jan 25 16:01:13 2017 +0000 |
tree | 8cf66e6e3d26c82c96d78a046f065abcce6a78dc | |
parent | 3e495b4001889596ac6b148cffd1735343a1333e [diff] | |
parent | 163732e89fafdef6e4b38f7584336611b2135092 [diff] |
Merge branch 'obsd-master'