commit | 2864a313116c75eb2deb078c07708e3ef9ff145b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Nov 24 20:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Nov 24 20:01:10 2016 +0000 |
tree | 0e04c1f8a02e7d09aaa765d7fb0d81d75f7cabfe | |
parent | a02d95a313e0a289a46c2b77eb59d6c6d1488012 [diff] | |
parent | 6f8cedb1bc147f2d05d63c2c085b2791fd841c19 [diff] |
Merge branch 'obsd-master'