Frederik Rietdijk 2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD		2017-12-30 17:04:54 +01:00
..
darwin	libresolv: fix library version	2017-12-27 18:41:31 +01:00
gnu
linux	zfsUnstable: 2017-11-16 -> 2017-12-28	2017-12-30 12:20:30 +01:00
windows	Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix	2017-12-29 15:28:56 -05:00