commit | 14dc2acc25b13c60a7d56eac31eed0d9ab75e339 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Feb 22 10:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Feb 22 10:01:12 2017 +0000 |
tree | cc9a9f0837f88442de26e941ecdadb03d8f65e50 | |
parent | 4b112c19f1c294110d3c406eb830fb998b7f743f [diff] | |
parent | 0414b1fc78c8c47af49ffe6305999df8592be24f [diff] |
Merge branch 'obsd-master'