commit | 5d21faa99c9a005208e88be72ef2c1e02cf6d128 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jan 16 02:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 16 02:01:10 2016 +0000 |
tree | 7989248cab6f1c676b4cfe969cd578c9f660b7fe | |
parent | 506adf376478c28a8ac50768cedc067fdd089483 [diff] | |
parent | c9815307ebe8b729504d383904ae3ef3b862cf11 [diff] |
Merge branch 'obsd-master'