tree 030a068e8fe43445027489612b8befcff9b409db
parent b82ae56e53f3d6dda8a750304de2dbe365c41030
parent d58d420f116e854bfd7b155cc1aed4e32939e1da
author Tatu Saloranta <tatu.saloranta@iki.fi> 1456200915 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1456200915 -0800

Merge branch '2.7'