Merge pull request #2914 from alalek:fix2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)
commitd826bcdbbb0dd60378e3bf20f9c08655e4447f24
treef7726ff4f8e6de0459f246c9306b5956b4fa5dda
parent1138fbb940314e7079e9329eba492e067916b38c
parent5c8cd76893b6035748ae406c6409d5a52cf8bcf9
Merge pull request #2914 from alalek:fix2.4