| commit | 506adf376478c28a8ac50768cedc067fdd089483 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Jan 15 12:01:11 2016 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 15 12:01:11 2016 +0000 |
| tree | 447452b49bd28529c469d1db3e8b066be830ab6d | |
| parent | ea9873e60e1161b6e2b720cc04706a4b35f48763 [diff] | |
| parent | d551ab8e5cfb00fbb7a79e7f0c3f4f2780fc6824 [diff] |
Merge branch 'obsd-master'