commit | 6270392d0448b9c949dcc6698962446ff5988383 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Oct 13 12:01:11 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Oct 13 12:01:11 2016 +0100 |
tree | daa1be979c7b8fbd8e18c1fdcb0a9ba8d2fcc01e | |
parent | 6551f4bb3b651aa2dba77a98cc42828737b88306 [diff] | |
parent | 4d9e6ea3106ea06afa4583254549d525b31ed277 [diff] |
Merge branch 'obsd-master'