Merge pull request #2856 from sanchom:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 14:22:55 +0000 (14:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 14:22:56 +0000 (14:22 +0000)
commitc3329ff79da86493f9bbe09659109db9a73cfe17
treeb9dbdf37d326e430ca3fd11f8232444f9abd9985
parent0e534b5a25617adda9fc0083cf7a7af26d14d222
parente1e243588e73aa96a458f8f585f4ed055fc685d4
Merge pull request #2856 from sanchom:master