Merge ^/head r293430 through r293685.
authordim <dim@FreeBSD.org>
Mon, 11 Jan 2016 19:36:44 +0000 (19:36 +0000)
committerdim <dim@FreeBSD.org>
Mon, 11 Jan 2016 19:36:44 +0000 (19:36 +0000)
commit79c349e677e1561f808f42fec3e6151d88397dd8
treeea943142da24fe9f4d36e8fd2ca89c22a874740d
parentca5a713355f56c0b7f18b4a361310ac52b13b066
parent4ba3f354902d216384ffbcd5a6b1b3e219d451ea
Merge ^/head r293430 through r293685.
Makefile.inc1