Merge pull request #2905 from Jazmann:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 1 Jul 2014 18:41:14 +0000 (18:41 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 1 Jul 2014 18:41:15 +0000 (18:41 +0000)
commit1b18ebf28a156488298293772b3e0454a5300cb5
tree6626427b96bfe025dff84dd23337db81c31de5bc
parentf6cf68094f8c663d295920eb8fb57ed61a7b4101
parentf45da9866a94dbf52f5fb955bea67fce913ca515
Merge pull request #2905 from Jazmann:2.4