tree 56fd4088898893d0b408f114c7fb54eeab2f02ac
parent d29ae45d5e99e68654f33e06dfd76640a0e0dd2c
parent 2cff3f2ef4828c755a545e5abacd3d7b2da3fc6d
author Carlos Martín Nieto <carlosmn@github.com> 1499546218 +0200
committer Carlos Martín Nieto <carlosmn@github.com> 1499546218 +0200

Merge remote-tracking branch 'origin/master' into v26