commit | 3e8efcc555a2767ff0abc121cb3232d7e84c3873 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 19 09:22:03 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 19 09:22:03 2014 +0000 |
tree | d655f7fdb10952e417cd79e2f907e5e9d75ea0c5 | |
parent | bd803e82e96512473036461ec3832c569768e535 [diff] | |
parent | e0929262db947f984964f979a23215c0de75ceb2 [diff] |
Merge branch 'obsd-master'