Merge pull request #5238 from LorenaGdL:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 24 Aug 2015 00:47:00 +0000 (00:47 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 24 Aug 2015 00:47:01 +0000 (00:47 +0000)
commitc385ac575dd21a9d604efa3b747817015fac409f
treebfaae7000b2db83914c94aacc0b41ef0ca727aa3
parent6c421125555e86d6189c597a839c62cbfd491908
parent9d01818e8a9aaed5793837c8bffc56d8d1cd09b9
Merge pull request #5238 from LorenaGdL:master