commit | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 16:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 16:01:09 2015 +0100 |
tree | 5ff6d44f3a7f1dabd9a40d0fa7a9176190a9e131 | |
parent | 84eabb2658f9ad1bec81344aa425f66a903c931d [diff] | |
parent | b0940bdf5460ec3324254b5df68b5386513641b2 [diff] |
Merge branch 'obsd-master'