commit | 7e110b9d99cf4ffa05e316c954d5f2f315e3f7cc | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jan 16 15:36:02 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jan 16 15:36:02 2017 +0000 |
tree | 556e0e939b96290f5e2e233044d03c28366c25ae | |
parent | f20e3ee62c310da3eb091a2773e21442412db4ed [diff] | |
parent | ef15b4195f1453bf6f81cfd1e456c049922aa574 [diff] |
Merge branch 'obsd-master'