commit | bd803e82e96512473036461ec3832c569768e535 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 12 21:58:05 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 12 21:58:05 2014 +0000 |
tree | 85c0c8298e962531d2f3df4b65c150731c425d87 | |
parent | fc05bf255af2a39a8168320455f79e7e6d9e915a [diff] | |
parent | f9308bc244bb568fb678effbbb08f8fb277e7560 [diff] |
Merge branch 'obsd-master'