commit | a77355b6bf9a0beb2e9d0a8b9613266984bb598d | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Oct 16 16:46:31 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Oct 16 16:46:31 2014 +0100 |
tree | 38ca21b0aeb986adea2de22cc12adda8a52cf4c5 | |
parent | 2874a431c050527244a56e7f241baf053c722f88 [diff] | |
parent | a27ba6e38006c12c48de88600b8cff9f6aabfed7 [diff] |
Merge branch 'obsd-master'