commit | d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 31 21:39:56 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 31 21:39:56 2014 +0000 |
tree | 397f4999444c2eef367f884b815bec2a14697c3c | |
parent | cbf9224c5f7bcf07352f6ea128c90c12cb0af22e [diff] | |
parent | 9f02feb9d089b1a4639afb52ab0e8212eeb55a7c [diff] |
Merge branch 'obsd-master' Conflicts: Makefile cmd-server-info.c cmd-start-server.c