commit | 896581628dc53556861b63f2cb4094a48f9eaf94 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Nov 05 12:01:08 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Nov 05 12:01:08 2015 +0000 |
tree | 956fbec4f69fae1282c89330602ff7219b643b2d | |
parent | 696826913cef831f71cd7ce497720f7ebbc333f3 [diff] | |
parent | 5577535891e709f87f88311a1adef55dd6c6de85 [diff] |
Merge branch 'obsd-master'