Merge pull request #3042 from edgarriba:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Aug 2014 13:18:37 +0000 (13:18 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Aug 2014 13:18:37 +0000 (13:18 +0000)
commitb2cd954f247c8d5c0b83c1671300113128ee5f0e
tree573f60c250f8273385fb7eed349a8b29d832b029
parent57a1343f10312a8b806443c2cf9e61fa044fa8e5
parentdeec233519155f832fb78e70b283cf02d1c8b9be
Merge pull request #3042 from edgarriba:master