commit | 570943beb75d462ff5f483d47d9735ade03d9ae7 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 14:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 14:01:12 2017 +0000 |
tree | 600a0522c50f2e0aaa75a20571cc89f83abbb5ae | |
parent | 1e12e1d843ba45a7d95b866a61357c435a8acc16 [diff] | |
parent | 5ea7a00ebac6d6d6423667a3637bc575515b3be0 [diff] |
Merge branch 'obsd-master'