commit | 2ad9caad3f9997f47fb556e5c5bcb0685f291000 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Dec 18 00:01:08 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 18 00:01:08 2015 +0000 |
tree | 1e5f3b4fe03759bf8780cd489b48178c77097634 | |
parent | e0cae08c04a1adca313ec94b7557496142cc2173 [diff] | |
parent | a337403868cb55f2d7f197cce6e5b18c1154540c [diff] |
Merge branch 'obsd-master'