| commit | ad2532c3f459650eb578d4aeeda4cb3c8962777c | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Mon Apr 04 18:01:11 2016 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Mon Apr 04 18:01:11 2016 +0100 |
| tree | ecf752da699638cebd544724f14897ef2afac0ca | |
| parent | 7b8dcbaa865d358d26a20bb60d72f35b6ef9bc1b [diff] | |
| parent | 075c086d29cbf22397ba2dda4b43db7e7df31781 [diff] |
Merge branch 'obsd-master'