commit | 8ae9329aa83dd0772c904a7172de12c0a1aadd7a | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Dec 05 14:01:09 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Dec 05 14:01:09 2015 +0000 |
tree | bb38c106e8ab6013bf6b19f915bc2dc4334e7175 | |
parent | 4d5cab408555341b64be10bf4fbd86a4d6415749 [diff] | |
parent | 0417f1f2bef1e8899dad4564db797250ae2c8c49 [diff] |
Merge branch 'obsd-master'