commit | bc6137f9e4244c2fde4e37ef47faebb942dae5f0 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Dec 14 01:30:15 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Dec 14 01:30:15 2015 +0000 |
tree | e216b6bf0df95898f7e04f6d8b5c7109261d048b | |
parent | 5caec3020d32596f3ecf3dea68639da18690992d [diff] | |
parent | a585a1b81a9122c2f7d7083304a4eb47d4e1c7ec [diff] |
Merge branch 'obsd-master'