commit | c9f2dc5ee5ffc2d71f492b23ff1ee80619c12258 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Feb 15 12:01:15 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Feb 15 12:01:15 2017 +0000 |
tree | 0cd069ad6ba37e6e5c04a72b63d9905c4fdd1522 | |
parent | 47bc867ab9409657b0b4855388fb991d1ca25135 [diff] | |
parent | dd25a6cdc21c76888c370a053ca2adb710a89cdf [diff] |
Merge branch 'obsd-master'