commit | f5c5847788c45dd700ccf5f18cf46ceb6d7042b3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Dec 30 16:01:15 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 30 16:01:15 2016 +0000 |
tree | a545af5a59adcfc166bc066c7bed6bd81b059f49 | |
parent | d3328a3b1e9cd873fa3a5ba30270499a2def6f0c [diff] | |
parent | 1015b124d5ccb4c9d32f0c5aae820f7a1ac98c5c [diff] |
Merge branch 'obsd-master'