commit | 696826913cef831f71cd7ce497720f7ebbc333f3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Nov 03 16:01:11 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Nov 03 16:01:11 2015 +0000 |
tree | cad2837be0af89037e022e0168fda33c5d31753a | |
parent | c975de2e07bdb21c85fc4f2c14a17bc00ca63aff [diff] | |
parent | 455284f1c02af1a4e0d68555e285563ce7fffb8f [diff] |
Merge branch 'obsd-master'