tree 7d77dbbacbce97d5bcd8537d5417a72ea0b49a1b
parent 454be8bb8c913be18298327a84ca45a280b61605
parent 87d29af25e82a249ea15858e2d4ecbf64091db44
author Tatu Saloranta <tatu.saloranta@iki.fi> 1534459511 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1534459511 -0700

Merge branch '2.6' into 2.7