commit | 8cf1504ba67307ee885c19c12d63a6a22016a582 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 29 12:01:16 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 29 12:01:16 2016 +0000 |
tree | 168042ba3854675033e003e06452cc58869c8eb1 | |
parent | 1d6bd50343f4395879169868e47bb59f5b2f3811 [diff] | |
parent | 427b8204268af5548d09b830e101c59daa095df9 [diff] |
Merge branch 'obsd-master'