commit | 0bfa615997c4691d8c3b1342d05b2ba190da99c9 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 16:01:08 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 16:01:08 2015 +0100 |
tree | 61f22741a2082aa49efb2bc397320a1556492ede | |
parent | 35f582583a208f39bda248b50e50c1c0adec3cf0 [diff] | |
parent | 60ca29df64a96412ad6f78a294e0c68b01bed3d6 [diff] |
Merge branch 'obsd-master'