commit | af2d48f4d2493d98146490cebd3af150781a0425 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Oct 20 16:01:11 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 20 16:01:11 2015 +0100 |
tree | 3c9e09fe85df8007e17536db66ff13a8edc16a05 | |
parent | bbdc08780c23187a4984d5abb674fc1fbf66e605 [diff] | |
parent | 8c8cddbe022af5ece9949804cacffbee6b8972fa [diff] |
Merge branch 'obsd-master'