| commit | 2a3456cd3b234a2f5d0b6724fe41bb62b8deab4e | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Dec 11 16:01:16 2015 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 11 16:01:16 2015 +0000 |
| tree | ea211ec5577102c81891adfabc5f135f865d8f1e | |
| parent | 4909a7017494f7483cfd2180913ad78f87bc9d62 [diff] | |
| parent | bd5918760ecd1f40a574ccc8a302af869f68c27f [diff] |
Merge branch 'obsd-master'