commit | 1afe9e98de5455f75b2753b26069c8d55bd22c81 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Nov 15 16:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Nov 15 16:01:10 2016 +0000 |
tree | 37cb57028322156d73c5bb1682016e3a284adbe3 | |
parent | fe7d9af3311bbaccb85fcb3aff2ec24462eac32e [diff] | |
parent | c34a79b152e1d27ed87417e6a940358990ab9e79 [diff] |
Merge branch 'obsd-master'