commit | 31c027a37a18d11acdc5a1bc96c871dd0139744d | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 12:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Aug 28 12:01:07 2015 +0100 |
tree | 3474ad68d6038ab764bc9c757d373699ed3b2984 | |
parent | 031d7ce840b34ad0286d4b1345067e868f6ceccd [diff] | |
parent | ee9f708500c2a6987b7a3c0aba2ac5e88812d8aa [diff] |
Merge branch 'obsd-master'