| commit | a9d501e975ca2ecbcb79262678d2f17694b58856 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 12:01:09 2016 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 12:01:09 2016 +0100 |
| tree | 548bd126d84e9dee3318070e869005b6b56430c2 | |
| parent | 7a02910feb9cea4006a0b9a925c3f6cc7984db3b [diff] | |
| parent | 7abdfbe20ed01315d84d5b0f02712bd88d407445 [diff] |
Merge branch 'obsd-master'