commit | db8dff6814fd77c6cc86b9c0009b7afcdd95f196 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 20:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 20:01:12 2017 +0000 |
tree | 6cd4d72f59595ef16381de2d68ccffcb1280d52d | |
parent | ba35e8f2927c71a37dc423a4bed88a136ba99c0c [diff] | |
parent | aa4de2d4b29fc7bdb15a207d44682a173ab874b6 [diff] |
Merge branch 'obsd-master'