commit | dedd9edf7fbfa6bc98445f4d33d9d5a4e7c34854 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jul 20 12:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jul 20 12:01:07 2015 +0100 |
tree | 4f3c270aa6e7d38655c542a49358c1946f5177cb | |
parent | e45f42db29b70addec8d1dd9b63dddd31160968c [diff] | |
parent | d4ce210713cc907fc69497c51cf9b64d2f414ca4 [diff] |
Merge branch 'obsd-master'