commit | e7de2fe552a7b4392f208533b72e7fcbe41c0537 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 14:01:09 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 14:01:09 2016 +0100 |
tree | 88beeaa378b9d913e00f2e66f54074ec57a4510a | |
parent | 65e4c57d3a554940ed5cada6dfeff403ae8d9572 [diff] | |
parent | 97417a18130ea17dbf9ab62b5e6dabb25376a988 [diff] |
Merge branch 'obsd-master'