commit | bb820fa761747a2c5342f61c4fbe5368565ef9b3 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Nov 14 14:01:08 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Nov 14 14:01:08 2015 +0000 |
tree | 42cfda38fa2f55aa6a9728a28311525627856fd3 | |
parent | f12d7f0d4b4a474acbdec0023156a6a647aa7763 [diff] | |
parent | 14d90e4901ef943e57e5dada7a0f53b2dc208571 [diff] |
Merge branch 'obsd-master'