Merge branch 'scintilla/update-366'
commit916c41e1e6eb8603078f18dfba3645a40f178e8a
authorColomban Wendling <ban@herbesfolles.org>
Thu, 26 May 2016 17:23:08 +0000 (26 19:23 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Thu, 26 May 2016 17:23:08 +0000 (26 19:23 +0200)
treea451e7baed068ef81c80fcd5a20b292eadc5137b
parentd7750a44796b0ddc1c7a8968fd53aad91382d686
parent04296390dea9d7e288adb7b559badf803b60dff8
Merge branch 'scintilla/update-366'