commit | a584e11d6bb5d2ab0e0476f6c1a821e865597053 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Jun 17 18:01:07 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Jun 17 18:01:07 2015 +0100 |
tree | a9c8b6c9acef5c112ee321758422d08e1915cdd1 | |
parent | 9fdc3a069a55aad638b2985cd5427a1853335f24 [diff] | |
parent | 021cdbe1c0111951a1f63b09b41c9e3db3793db5 [diff] |
Merge branch 'obsd-master'