commit | 778612d1526a7c927106609f4925da365e41c498 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Aug 13 18:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Aug 13 18:01:07 2015 +0100 |
tree | 056031a53f234f12e1886d0216dd8033a51d1a65 | |
parent | 6447404cc23a8593bc55840827f769b270b9d5be [diff] | |
parent | 46aa92420a4d3af7d273155aabb646d4bc91bb01 [diff] |
Merge branch 'obsd-master'