commit | a131b82e95df990528371b1d9ca40ee2be264fc8 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Aug 09 20:31:36 2014 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Aug 09 20:31:36 2014 +0100 |
tree | 156ef097c276e22b60581e3058e2661327240869 | |
parent | fd3b7f357200b85a6f3d6e39bae676c7c70ba082 [diff] | |
parent | 1ac96200a7462597b137719b376f40ad0cd85216 [diff] |
Merge branch 'obsd-master' Conflicts: client.c