commit | be033b1ed0568c6e79e6d0079b940e06719dc9b1 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Feb 09 00:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Feb 09 00:01:12 2017 +0000 |
tree | 7168beef2870804d6301eea9f1e35e71b4650ccf | |
parent | 130b77edc737fcd113964fd77123285d78dfe3f9 [diff] | |
parent | 2f854969ff8dfea7b03b6534318a64f51e9c65e7 [diff] |
Merge branch 'obsd-master'