commit | e8bb385d6d9d8a91b5fa78e906531afc02320b80 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Oct 29 10:01:09 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Oct 29 10:01:09 2015 +0000 |
tree | a8da864a21b2ba4fdaa6c5cb843c6a864e24de82 | |
parent | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a [diff] | |
parent | 45f3cea263d1f99912cd6b353c91ccb872c26a71 [diff] |
Merge branch 'obsd-master'