Merge pull request #2840 from ilya-lavrenov:tapi_calchist
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 20 Jun 2014 08:46:32 +0000 (08:46 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 20 Jun 2014 08:46:32 +0000 (08:46 +0000)

Trivial merge