Merge pull request #7042 from alalek:update_6967
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:17:48 +0000 (15:17 +0000)
commita95d63dab64fc6800ffd915766ba6c4ffd2b1328
tree4d45c21b1737742906fa5b070b35c99c5dbd1406
parent39ebca5dbf85d2f77bce83d589bc0b8f22db0282
parentb12286329fdc8b5c840a6c310f44271240a62aca
Merge pull request #7042 from alalek:update_6967