commit | 1a33ea9671895258cee37cf89a209e56ecf578fb | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Dec 15 02:01:14 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Dec 15 02:01:14 2015 +0000 |
tree | 73ab6a6db7131c90bfeba60813423bbe316b31da | |
parent | 6ab17e3e15f8cbaf12fa3a9ea038a4e65f19ba85 [diff] | |
parent | 9d88d82d5e8caa7882a28ac95fda19754e5553e7 [diff] |
Merge branch 'obsd-master'