commit | 84eabb2658f9ad1bec81344aa425f66a903c931d | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 14:01:11 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 14:01:11 2015 +0100 |
tree | 98c743d4888d1414884ec418d1eaf354c9a07213 | |
parent | 31c027a37a18d11acdc5a1bc96c871dd0139744d [diff] | |
parent | 675def039652e69d8fd5f229eff2128116e1d328 [diff] |
Merge branch 'obsd-master'