Merge pull request #7061 from catree:add_camera_model_doc_2_4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 8 Aug 2016 11:47:54 +0000 (11:47 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 8 Aug 2016 11:47:54 +0000 (11:47 +0000)

Trivial merge