Merge pull request #4007 from martin-ueding:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)
commit3f180b0ad9a53c6389cb29f3a5b5e6b09c4cd965
treec38e045689beb2fd12920ffcdd1ed0e34651d581
parent4af2eb22ab903cfc90de111aa4e67f4fa20d3548
parent1e00a93f97f47fcd2e02f4fa4e5091f598062995
Merge pull request #4007 from martin-ueding:master