| commit | f0ac0d6793b206222454d6d3ac3559a7bc13702b | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue May 22 11:02:33 2018 +0100 | 
| committer | Thomas Adam <thomas@xteddy.org> | Tue May 22 11:02:33 2018 +0100 | 
| tree | 7f45447169281eefe6986c137bd5461c1dd29e23 | |
| parent | 07c0970f541f88d5969d967d03f8f7371d69b0f7 [diff] | |
| parent | 2a04665626959dd57a88db2fd42813877e7f7fde [diff] | 
Merge branch 'obsd-master'