Merge pull request #3969 from Dikay900:master_to_2_4
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 4 May 2015 10:13:44 +0000 (10:13 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 4 May 2015 10:13:45 +0000 (10:13 +0000)
commit90c3d7d3616008329b67ac78b6d9b7e3a590f58a
tree1f9aa4c98f8fabbc1ab418cad3b01e2bc7c31075
parent5c12c922433abf7052ed0bae1a2ffd12e1a9baa3
parent83eb1d3608a580871410d12057177fe7bcf51a5a
Merge pull request #3969 from Dikay900:master_to_2_4