Merge pull request #3336 from BKNio:putText_develop2
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 27 Oct 2014 11:56:25 +0000 (11:56 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 27 Oct 2014 11:56:25 +0000 (11:56 +0000)

Trivial merge