commit | 276ca5f04c8601a04cbaed3d65f56e3a25cea65f | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Nov 13 18:01:13 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Nov 13 18:01:13 2015 +0000 |
tree | 6329b0bd56d5b94c12bf824f6336db9f899143b3 | |
parent | 1016f112bfa3d626c54db20c7cbd0814e90e174c [diff] | |
parent | c4893d8efdba87843f7f0d8a85c084e1e38d1430 [diff] |
Merge branch 'obsd-master'