commit | d3ede11212b78beebea5d02a7cfc35e65e8f8349 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Dec 08 00:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Dec 08 00:01:10 2016 +0000 |
tree | e2c77d4018208ad5cd903bed35056239b31150b8 | |
parent | b9fa8f12d7b56a331a53f347bfe81e62ca351dc5 [diff] | |
parent | 5819d2a9d75511c4ba7fd7adbeec6b778647e0d7 [diff] |
Merge branch 'obsd-master'