commit | ea9873e60e1161b6e2b720cc04706a4b35f48763 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jan 02 18:01:12 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 02 18:01:12 2016 +0000 |
tree | 08f2a70392e289e6e7c694ac7410380a15b401be | |
parent | 051cf5437acecf83f27d76c5c12d514ff9d6c283 [diff] | |
parent | cfb78654c2b9a9f0c2f90c22228563d5385c510c [diff] |
Merge branch 'obsd-master'