Merge pull request #7812 from alalek:fix_putText
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 15 Dec 2016 13:33:56 +0000 (13:33 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 15 Dec 2016 13:33:56 +0000 (13:33 +0000)

Trivial merge