commit | 20d97eb849282ae2ca5ff543f6826d689a07199a | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu May 26 18:01:09 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu May 26 18:01:09 2016 +0100 |
tree | 67d88b1a02e6d8b06c09616ced5fd8d3c6c11903 | |
parent | 95e304d1113410e1deb5245bfe8d55a1cd44a059 [diff] | |
parent | ec7f5305b1a6e5548f0769f988e76b01ec293dcc [diff] |
Merge branch 'obsd-master'