tree 711be7a4dc5966fa97c3dc3f766e064805bd65a5
parent 397b07734d406a2fb8135a34b8c5deaefe5d9f03
parent 5f103c3bb9679a86e9c179f3c8172a12b1bbd401
author Luca Milanesio <luca.milanesio@gmail.com> 1495090678 +0100
committer GitHub <noreply@github.com> 1495090678 +0100

Merge branch 'master' into stable-2.14