| commit | 29e64a8c648eaf6e1bebf6018066991e032756ab | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Sat Jan 07 16:01:17 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 07 16:01:17 2017 +0000 |
| tree | 441b101753a93a27aa82e5713bd1af4a27d4572f | |
| parent | a3428487a787c9ab43cd628338dcc290499891ae [diff] | |
| parent | 314e933914de4096c40e623c793049d26484d53a [diff] |
Merge branch 'obsd-master'