Merge pull request #2940 from davembradley:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)
commitdce1824a915be33100cba4d9213a39652951869d
tree7d8b4b00755bc3f5845ba5e171dc51d17a04bc5d
parentcf2a30783200c19d40f41c19127747255eecdc21
parentb71744082b9d601bde333c2d3743a4694fb1d498
Merge pull request #2940 from davembradley:master