commit | 6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu May 12 18:01:10 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu May 12 18:01:10 2016 +0100 |
tree | df22b83d46308de5bf6815fff8f01778e5c83ab0 | |
parent | 3ec7e3c006d3eb86547b5a1b47dd8d873d7b0284 [diff] | |
parent | fdd368a2945f1f5cbd1cd2a858c00ebffdbf7e46 [diff] |
Merge branch 'obsd-master'